fix(auth-secrets): fix system update secrets (#351)

* fix(auth-secret): remove auth secret from common template, cannot be used by all jobs
acryldata · Aug 18, 2023 · ea8a178 · ea8a178
1 parent 30eee99
commit ea8a178
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for LinkedIn DataHub
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.2.181
+version: 0.2.182
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.10.5

diff --git a/charts/datahub/templates/datahub-upgrade/_upgrade.tpl b/charts/datahub/templates/datahub-upgrade/_upgrade.tpl
@@ -39,15 +39,6 @@ Return the env variables for upgrade jobs
   value: "{{ .Values.global.sql.datasource.url }}"
 - name: EBEAN_DATASOURCE_DRIVER
   value: "{{ .Values.global.sql.datasource.driver }}"
-{{- if .Values.global.datahub.metadata_service_authentication.enabled }}
-- name: DATAHUB_SYSTEM_CLIENT_ID
-  value: {{ .Values.global.datahub.metadata_service_authentication.systemClientId }}
-- name: DATAHUB_SYSTEM_CLIENT_SECRET
-  valueFrom:
-    secretKeyRef:
-      name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
-      key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
-{{- end }}
 - name: KAFKA_BOOTSTRAP_SERVER
   value: "{{ .Values.global.kafka.bootstrap.server }}"
 {{- if eq .Values.global.kafka.schemaregistry.type "INTERNAL" }}

diff --git a/charts/datahub/templates/datahub-upgrade/datahub-cleanup-job-template.yml b/charts/datahub/templates/datahub-upgrade/datahub-cleanup-job-template.yml
@@ -58,6 +58,15 @@ spec:
               args: [ "-u", "NoCodeDataMigrationCleanup" ]
               env:
                 {{- include "datahub.upgrade.env" . | nindent 16}}
+                {{- if .Values.global.datahub.metadata_service_authentication.enabled }}
+                - name: DATAHUB_SYSTEM_CLIENT_ID
+                  value: {{ .Values.global.datahub.metadata_service_authentication.systemClientId }}
+                - name: DATAHUB_SYSTEM_CLIENT_SECRET
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
+                      key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
+                {{- end }}
               {{- with .Values.datahubUpgrade.extraEnvs }}
                 {{- toYaml . | nindent 16 }}
               {{- end }}

diff --git a/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml
@@ -68,6 +68,15 @@ spec:
             - "dbType={{ .Values.datahubUpgrade.noCodeDataMigration.sqlDbType }}"
           env:
             {{- include "datahub.upgrade.env" . | nindent 12}}
+            {{- if .Values.global.datahub.metadata_service_authentication.enabled }}
+            - name: DATAHUB_SYSTEM_CLIENT_ID
+              value: {{ .Values.global.datahub.metadata_service_authentication.systemClientId }}
+            - name: DATAHUB_SYSTEM_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
+                  key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
+            {{- end }}
           {{- with .Values.datahubUpgrade.extraEnvs }}
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml b/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml
@@ -70,6 +70,15 @@ spec:
                 - "batchDelayMs={{ .Values.datahubUpgrade.batchDelayMs }}"
               env:
                 {{- include "datahub.upgrade.env" . | nindent 16}}
+                {{- if .Values.global.datahub.metadata_service_authentication.enabled }}
+                - name: DATAHUB_SYSTEM_CLIENT_ID
+                  value: {{ .Values.global.datahub.metadata_service_authentication.systemClientId }}
+                - name: DATAHUB_SYSTEM_CLIENT_SECRET
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
+                      key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
+                {{- end }}
               {{- with .Values.datahubUpgrade.extraEnvs }}
                 {{- toYaml . | nindent 16 }}
               {{- end }}