helm changes added

sourcefuse · Sep 24, 2024 · cc90a6a · cc90a6a
1 parent cdf55c3
commit cc90a6a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 4 deletions.
diff --git a/files/control-plane/control-plane-helm-chart/templates/cm-tenant-mgmt-facade.yaml b/files/control-plane/control-plane-helm-chart/templates/cm-tenant-mgmt-facade.yaml
@@ -20,8 +20,4 @@ data:
       GATEWAY_ACCOUNT_ID: '{{ .Values.tenantMgmtFacade.gateway_id }}'
       WEBHOOK_USERNAME: '{{ .Values.tenantMgmtFacade.webhook_user }}'
       WEBHOOK_PASSWORD: '{{ .Values.tenantMgmtFacade.webhook_password }}'
-{{- if .Values.marketPlaceIntegration.enabled }}
-      PRIVATE_KEY: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrCbRoK1v1nj6RqPtcX7OBqcTGtod82lSgvKytCo6Pwb9CIv613VYazfKiXd2vj9XjIsJyw7zMpGSEv8dPq3X03LvOoxPiiqiJ0kBpHj8SvQyw1LEB7FBN8IQ3Vq4B6jgzFY8cNrHN+WgemXE4bAeCTLmzjtb+rXeANzydBnXKNlL9GjYbuvqVPP3Em4e2Mx2y1htWCGX6NjuelAMbe9HfA26+B4OjOhIVr1J89fIIPwkfwdZgXDTWiO9qU2m1HmP/KYiQztPveBL1qlY8kTKEZuCSHAtimkWoCQ324wjOhWkECocKvv9qY95vz4+sleGjnU0KQ7QTuM2/Iv6gkSo5AgMBAAECggEAFUDPVr7ljk2vvXKbqnC3afIuMhmSGC76o18Sj22PhbhH83hNAY0LgyjqgKfMkWFcjPz/n9poAl9eoLrCcelOzuKjYTPVN5oug3K5f35rTMEqW6pQRPqIB4lOqqA2HuWLfniMOA+pVDyMxjmfrqjI3ZV6YWArYcntHqTufp4kAqB9bX8RbagCHkaCp1CfPraCLeYTSiwMqQ/ryh4nUvvABSo+kp97AWEdj44RA7wwv2PhITum1wmrEC5EC/WZnCgpFnvPciMcpzs6zDgPXVRJsHFpKSNJCmPF3nIdLEx4+ZGotV7p1phQGTVfkAk1Nhe/RjyCf9YugoO5FV2X1x81gQKBgQC785GX9hj9P4K6jI+cxzNuVRu1Lz24veLVaFsrWZck755CAzhddaAFp22zZtsU07XfVFNC1r4YGvgBsyuuFeJbtIq9Hg/ZuGRc4mZJblgTtc1WWBj8w1ulxIYiZbDBjz9hGrMzIKJZ2bkGx3Rfu7JjP8030VPARjpiECRoV0UYgQKBgQDo9n3dfpn+DImXNWm7RkWW532ew2Szasb4G3bY9Ju/qWI4XHQVfH1WgeBDWgPimw4go7E/vm3iBALQDoSgfyxmtDE0V7yvbUWTOP03DfpHqYOtWLbnEg2s0lAOugvd/dME03A958Xm4j1iBD3tu2T1KoArh+Pbv49+tgzXL6/1uQKBgQCmvZ3zn3tp6Jc0opChuMNy5YRQSBnMtIDxbMQ9AB0rwny2+Z5eo4SUn4Wd++juYCfgejHngRVh00MkVuywY2/OhavzvSC4uXIoSR4PlRoEWmxRZpS8YSAEPwX0rByUi13h6ssB17jQV2xjjD081QqcLDUGiOlxEZyn9MQn4QxGgQKBgBVvSJluoqCbarV89qOCjbiayBYpiERx2KjPbhn8N7Bk12K0LwIjGC0zefz4dU8OUThzl0V0MgwPrmqSS2WxDdbNUZGtWPETLsmi/rloEdUyJal3dizAnn1+RFt2hs0AI8BX7AXmI3Fg86DnHwOWsG1WYcCfmjmH4J4aBghunNQRAoGAVxDfgTMUMzOJQi4AKQE+gVQLP994IqKJaekMsvDs6VUSRhgv4nZWNk7JmTBQZfCfT7+LASUgNIbUv+so8qed1jWAjPknW7PjexM5OhyWCSIFmWxhuxS01JIEbCB3J8jecpVOirTS2MBJiaWNQtWGiW/ddfcrAKBvxaLwXUvjS8E="
-      PUBLIC_KEY: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqwm0aCtb9Z4+kaj7XF+zganExraHfNpUoLysrQqOj8G/QiL+td1WGs3yol3dr4/V4yLCcsO8zKRkhL/HT6t19Ny7zqMT4oqoidJAaR4/Er0MsNSxAexQTfCEN1auAeo4MxWPHDaxzfloHplxOGwHgky5s47W/q13gDc8nQZ1yjZS/Ro2G7r6lTz9xJuHtjMdstYbVghl+jY7npQDG3vR3wNuvgeDozoSFa9SfPXyCD8JH8HWYFw01ojvalNptR5j/ymIkM7T73gS9apWPJEyhGbgkhwLYppFqAkN9uMIzoVpBAqHCr7/amPeb8+PrJXho51NCkO0E7jNvyL+oJEqOQIDAQAB"
-{{- end}}
 {{- end}}
diff --git a/files/control-plane/control-plane-helm-chart/templates/secret-provider-class-and-sa.yaml b/files/control-plane/control-plane-helm-chart/templates/secret-provider-class-and-sa.yaml
@@ -69,6 +69,10 @@ spec:
       key: COGNITO_AUTH_CLIENT_ID
     - objectName: cognito_client_secret
       key: COGNITO_AUTH_CLIENT_SECRET
+    - objectName: private_key
+      key: PRIVATE_KEY
+    - objectName: public_key
+      key: PUBLIC_KEY
 {{- if .Values.ses.enabled }}
     - objectName: ses_access_key
       key: SMTP_USER
@@ -138,6 +142,12 @@ spec:
       - objectName: {{ .Values.cognitosecret }}
         objectType: ssmparameter
         objectAlias: cognito_client_secret
+      - objectName: {{ .Values.privateKey }}
+        objectType: ssmparameter
+        objectAlias: private_key
+      - objectName: {{ .Values.publicKey }}
+        objectType: ssmparameter
+        objectAlias: public_key
 {{- if .Values.ses.enabled }}
       - objectName: "/{{ .Values.projectName }}/ses_access_key"
         objectType: ssmparameter

diff --git a/files/control-plane/control-plane-helm-chart/templates/tenant-mgmt-facade-deployment.yaml b/files/control-plane/control-plane-helm-chart/templates/tenant-mgmt-facade-deployment.yaml
@@ -158,6 +158,16 @@ spec:
               secretKeyRef:
                 name: api-token
                 key: DB_SCHEMA
+          - name: PRIVATE_KEY
+            valueFrom:
+              secretKeyRef:
+                name: api-token
+                key: PRIVATE_KEY
+          - name: PUBLIC_KEY
+            valueFrom:
+              secretKeyRef:
+                name: api-token
+                key: PUBLIC_KEY
 {{- if .Values.imagePullSecret.enabled }}            
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret.name }}

diff --git a/files/control-plane/control-plane-helm-chart/values.yaml.template b/files/control-plane/control-plane-helm-chart/values.yaml.template
@@ -458,3 +458,5 @@ tenantmgmtdbdatabase: ${TENANT_MGMT_DATABASE}
 cognitodomain: ${COGNITO_DOMAIN}
 cognitoid: ${COGNITO_ID}
 cognitosecret: ${COGNITO_SECRET}
+privateKey: ${PRIVATE_KEY}
+publicKey: ${PUBLIC_KEY}
diff --git a/terraform/control-plane-application/data.tf b/terraform/control-plane-application/data.tf
@@ -18,6 +18,13 @@ data "aws_ssm_parameter" "github_repo" {
    name = "/github_saas_repo"
 }
 
+data "aws_ssm_parameter" "private_key" {
+  name = "/sf-arc-saas/dev/private-key"
+}
+
+data "aws_ssm_parameter" "public_key" {
+  name = "/sf-arc-saas/dev/public-key"
+}
 ############################################################################
 ## EKS data
 ############################################################################

diff --git a/terraform/control-plane-application/main.tf b/terraform/control-plane-application/main.tf
@@ -203,6 +203,8 @@ data "template_file" "helm_values_template" {
     COGNITO_ID                = data.aws_ssm_parameter.cognito_id.name
     COGNITO_SECRET            = data.aws_ssm_parameter.cognito_secret.name
     FROM_EMAIL                = var.from_email
+    PRIVATE_KEY               = data.aws_ssm_parameter.private_key.name
+    PUBLIC_KEY               = data.aws_ssm_parameter.public_key.name
   }
 }