From f5e1b4247318d6fee558c228e85178da04830271 Mon Sep 17 00:00:00 2001 From: David van der Spek Date: Tue, 20 Jun 2023 14:34:07 +0200 Subject: [PATCH 1/3] allow for overriding hook annotations Signed-off-by: David van der Spek --- .../templates/datahub-auth-secrets.yml | 4 ++ .../templates/datahub-encryption-secrets.yml | 4 ++ .../datahub-nocode-migration-job.yml | 8 ++-- .../datahub-system-update-job.yml | 8 ++-- .../templates/elasticsearch-setup-job.yml | 8 ++-- charts/datahub/templates/kafka-setup-job.yml | 8 ++-- charts/datahub/templates/mysql-setup-job.yml | 8 ++-- .../templates/postgresql-setup-job.yml | 8 ++-- charts/datahub/values.yaml | 38 +++++++++++++++++++ 9 files changed, 64 insertions(+), 30 deletions(-) diff --git a/charts/datahub/templates/datahub-auth-secrets.yml b/charts/datahub/templates/datahub-auth-secrets.yml index a3f0d469d..3cfe646ca 100644 --- a/charts/datahub/templates/datahub-auth-secrets.yml +++ b/charts/datahub/templates/datahub-auth-secrets.yml @@ -9,6 +9,10 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretRef }} + {{- with .annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} type: Opaque data: {{- if .autoGenerate }} diff --git a/charts/datahub/templates/datahub-encryption-secrets.yml b/charts/datahub/templates/datahub-encryption-secrets.yml index ae15bbdb4..aedda79f4 100644 --- a/charts/datahub/templates/datahub-encryption-secrets.yml +++ b/charts/datahub/templates/datahub-encryption-secrets.yml @@ -9,6 +9,10 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretRef }} + {{- with .annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} type: Opaque data: {{- if .autoGenerate }} diff --git a/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml index 697b567b4..052ac8df5 100644 --- a/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml +++ b/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-nocode-migration-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.datahubUpgrade.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": post-install,post-upgrade - "helm.sh/hook-weight": "-2" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.datahubUpgrade.podAnnotations}} diff --git a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml index 5fdb87ea4..72b1dd539 100644 --- a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml +++ b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-datahub-system-update-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.datahubSystemUpdate.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-install,pre-upgrade - "helm.sh/hook-weight": "-4" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.datahubSystemUpdate.podAnnotations}} diff --git a/charts/datahub/templates/elasticsearch-setup-job.yml b/charts/datahub/templates/elasticsearch-setup-job.yml index 4a231bbc3..e825e35d5 100644 --- a/charts/datahub/templates/elasticsearch-setup-job.yml +++ b/charts/datahub/templates/elasticsearch-setup-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-elasticsearch-setup-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.elasticsearchSetupJob.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-install,pre-upgrade - "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.elasticsearchSetupJob.podAnnotations }} diff --git a/charts/datahub/templates/kafka-setup-job.yml b/charts/datahub/templates/kafka-setup-job.yml index 0736ed0ad..e1aad50cc 100644 --- a/charts/datahub/templates/kafka-setup-job.yml +++ b/charts/datahub/templates/kafka-setup-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-kafka-setup-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.kafkaSetupJob.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-install,pre-upgrade - "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.kafkaSetupJob.podAnnotations }} diff --git a/charts/datahub/templates/mysql-setup-job.yml b/charts/datahub/templates/mysql-setup-job.yml index 003ac8408..ef72e153a 100644 --- a/charts/datahub/templates/mysql-setup-job.yml +++ b/charts/datahub/templates/mysql-setup-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-mysql-setup-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.mysqlSetupJob.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-install,pre-upgrade - "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.mysqlSetupJob.podAnnotations }} diff --git a/charts/datahub/templates/postgresql-setup-job.yml b/charts/datahub/templates/postgresql-setup-job.yml index 3ee198058..8ab281dcb 100644 --- a/charts/datahub/templates/postgresql-setup-job.yml +++ b/charts/datahub/templates/postgresql-setup-job.yml @@ -5,12 +5,10 @@ metadata: name: {{ .Release.Name }}-postgresql-setup-job labels: {{- include "datahub.labels" . | nindent 4 }} + {{- with .Values.postgresqlSetupJob.annotations }} annotations: - # This is what defines this resource as a hook. Without this line, the - # job is considered part of the release. - "helm.sh/hook": pre-install,pre-upgrade - "helm.sh/hook-weight": "-5" - "helm.sh/hook-delete-policy": before-hook-creation + {{- toYaml . | nindent 4 }} + {{- end }} spec: template: {{- if or .Values.global.podLabels .Values.postgresqlSetupJob.podAnnotations }} diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index 68b6dd876..eaa4b7e2a 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -100,6 +100,12 @@ elasticsearchSetupJob: fsGroup: 1000 securityContext: runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "-5" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} # Add extra sidecar containers to job pod extraSidecars: [] @@ -123,6 +129,12 @@ kafkaSetupJob: fsGroup: 1000 securityContext: runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "-5" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} # Add extra sidecar containers to job pod extraSidecars: [] @@ -146,6 +158,12 @@ mysqlSetupJob: fsGroup: 1000 securityContext: runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "-5" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} # Optionally set a set-up job specific login (defaults to global login) # username: "mysqlSetupJob-login" @@ -174,6 +192,12 @@ postgresqlSetupJob: fsGroup: 1000 securityContext: runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "-5" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} # Optionally set a set-up job specific login (defaults to global login) # username: "postgresqlSetupJob-login" @@ -205,6 +229,12 @@ datahubUpgrade: # fsGroup: 1000 securityContext: {} # runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: post-install,post-upgrade + helm.sh/hook-weight: "-2" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} # Add extra sidecar containers to job pod extraSidecars: [] @@ -252,6 +282,12 @@ datahubSystemUpdate: # fsGroup: 1000 securityContext: {} # runAsUser: 1000 + annotations: + # This is what defines this resource as a hook. Without this line, the + # job is considered part of the release. + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-weight: "-4" + helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} resources: limits: @@ -537,6 +573,7 @@ global: provisionSecret: enabled: true autoGenerate: true + annotations: {} # Only specify if autoGenerate set to false # secretValues: # encryptionKey: @@ -562,6 +599,7 @@ global: provisionSecrets: enabled: true autoGenerate: true + annotations: {} # Only specify if autoGenerate set to false # secretValues: # secret: From 7ae01a3e70db6a4489722a836cdbdcce285d9ed7 Mon Sep 17 00:00:00 2001 From: David van der Spek Date: Tue, 20 Jun 2023 14:35:13 +0200 Subject: [PATCH 2/3] allow for specifying init containers on all jobs Signed-off-by: David van der Spek --- .../datahub-upgrade/datahub-nocode-migration-job.yml | 4 ++-- .../templates/datahub-upgrade/datahub-system-update-job.yml | 4 ++-- charts/datahub/templates/elasticsearch-setup-job.yml | 4 ++++ charts/datahub/templates/kafka-setup-job.yml | 4 ++++ charts/datahub/templates/mysql-setup-job.yml | 4 ++++ charts/datahub/templates/postgresql-setup-job.yml | 4 ++++ charts/datahub/values.yaml | 6 ++++++ 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml index 052ac8df5..7649584e8 100644 --- a/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml +++ b/charts/datahub/templates/datahub-upgrade/datahub-nocode-migration-job.yml @@ -49,9 +49,9 @@ spec: restartPolicy: Never securityContext: {{- toYaml .Values.datahubUpgrade.podSecurityContext | nindent 8 }} - initContainers: {{- with .Values.datahubUpgrade.extraInitContainers }} - {{- toYaml . | nindent 12 }} + initContainers: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: datahub-upgrade-job diff --git a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml index 72b1dd539..e03e8b38f 100644 --- a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml +++ b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml @@ -49,9 +49,9 @@ spec: restartPolicy: Never securityContext: {{- toYaml .Values.datahubSystemUpdate.podSecurityContext | nindent 8 }} - initContainers: {{- with .Values.datahubSystemUpdate.extraInitContainers }} - {{- toYaml . | nindent 12 }} + initContainers: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: datahub-system-update-job diff --git a/charts/datahub/templates/elasticsearch-setup-job.yml b/charts/datahub/templates/elasticsearch-setup-job.yml index e825e35d5..8af9d1175 100644 --- a/charts/datahub/templates/elasticsearch-setup-job.yml +++ b/charts/datahub/templates/elasticsearch-setup-job.yml @@ -43,6 +43,10 @@ spec: restartPolicy: Never securityContext: {{- toYaml .Values.elasticsearchSetupJob.podSecurityContext | nindent 8 }} + {{- with .Values.elasticsearchSetupJob.extraInitContainers }} + initContainers: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: elasticsearch-setup-job image: "{{ .Values.elasticsearchSetupJob.image.repository }}:{{ required "Global or specific tag is required" ( .Values.elasticsearchSetupJob.image.tag | default .Values.global.datahub.version) }}" diff --git a/charts/datahub/templates/kafka-setup-job.yml b/charts/datahub/templates/kafka-setup-job.yml index e1aad50cc..a6551d7f1 100644 --- a/charts/datahub/templates/kafka-setup-job.yml +++ b/charts/datahub/templates/kafka-setup-job.yml @@ -49,6 +49,10 @@ spec: {{- with .Values.kafkaSetupJob.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.kafkaSetupJob.extraInitContainers }} + initContainers: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: kafka-setup-job image: "{{ .Values.kafkaSetupJob.image.repository }}:{{ required "Global or specific tag is required" ( .Values.kafkaSetupJob.image.tag | default .Values.global.datahub.version) }}" diff --git a/charts/datahub/templates/mysql-setup-job.yml b/charts/datahub/templates/mysql-setup-job.yml index ef72e153a..e847726ae 100644 --- a/charts/datahub/templates/mysql-setup-job.yml +++ b/charts/datahub/templates/mysql-setup-job.yml @@ -43,6 +43,10 @@ spec: restartPolicy: Never securityContext: {{- toYaml .Values.mysqlSetupJob.podSecurityContext | nindent 8 }} + {{- with .Values.mysqlSetupJob.extraInitContainers }} + initContainers: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: mysql-setup-job image: "{{ .Values.mysqlSetupJob.image.repository }}:{{ required "Global or specific tag is required" ( .Values.mysqlSetupJob.image.tag | default .Values.global.datahub.version) }}" diff --git a/charts/datahub/templates/postgresql-setup-job.yml b/charts/datahub/templates/postgresql-setup-job.yml index 8ab281dcb..f5c021468 100644 --- a/charts/datahub/templates/postgresql-setup-job.yml +++ b/charts/datahub/templates/postgresql-setup-job.yml @@ -43,6 +43,10 @@ spec: restartPolicy: Never securityContext: {{- toYaml .Values.postgresqlSetupJob.podSecurityContext | nindent 8 }} + {{- with .Values.postgresqlSetupJob.extraInitContainers }} + initContainers: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: postgresql-setup-job image: "{{ .Values.postgresqlSetupJob.image.repository }}:{{ required "Global or specific tag is required" (.Values.postgresqlSetupJob.image.tag | default .Values.global.datahub.version) }}" diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index eaa4b7e2a..6c485aa77 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -96,6 +96,7 @@ elasticsearchSetupJob: requests: cpu: 300m memory: 256Mi + extraInitContainers: [] podSecurityContext: fsGroup: 1000 securityContext: @@ -125,6 +126,7 @@ kafkaSetupJob: requests: cpu: 300m memory: 768Mi + extraInitContainers: [] podSecurityContext: fsGroup: 1000 securityContext: @@ -154,6 +156,7 @@ mysqlSetupJob: requests: cpu: 300m memory: 256Mi + extraInitContainers: [] podSecurityContext: fsGroup: 1000 securityContext: @@ -188,6 +191,7 @@ postgresqlSetupJob: requests: cpu: 300m memory: 256Mi + extraInitContainers: [] podSecurityContext: fsGroup: 1000 securityContext: @@ -271,6 +275,7 @@ datahubUpgrade: # extraEnvs: # - name: "DATAHUB_DB_NAME" # value: "dh" + extraInitContainers: [] ## Runs system update processes ## Includes: Elasticsearch Indices Creation/Reindex (See global.elasticsearch.index for additional configuration) @@ -301,6 +306,7 @@ datahubSystemUpdate: # - name: my-image-name # image: my-image # imagePullPolicy: Always + extraInitContainers: [] global: strict_mode: true From 9a95234f276f7da10bec44a81ddc680d9200fb29 Mon Sep 17 00:00:00 2001 From: David van der Spek Date: Tue, 20 Jun 2023 14:35:38 +0200 Subject: [PATCH 3/3] bump chart version Signed-off-by: David van der Spek --- charts/datahub/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 0c13c0aab..073aeef1c 100644 --- 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.175 +version: 0.2.176 # 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.4