fix(system-update): really fix indent this time (#446)

* fix(system-update): really fix indent this time * adjust nonblocking annotations
acryldata · Mar 27, 2024 · 268349b · 268349b
1 parent 63172db
commit 268349b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
@@ -4,13 +4,13 @@ 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.4.1
+version: 0.4.3
 # 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.13.0
 dependencies:
   - name: datahub-gms
-    version: 0.2.163
+    version: 0.2.164
     repository: file://./subcharts/datahub-gms
     condition: datahub-gms.enabled
   - name: datahub-frontend

diff --git a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
@@ -177,8 +177,8 @@ spec:
     {{- with .Values.global.podLabels }}
       labels:
         {{- range $key, $value := . }}
-          {{ $key }}: {{ $value | quote }}
-          {{- end }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     {{- end }}
     {{- end }}
     spec:
@@ -277,22 +277,22 @@ spec:
               value: {{ . | quote }}
             {{- end }}
           {{- with .Values.datahubSystemUpdate.extraEnvs }}
-          {{- toYaml . | nindent 10 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           securityContext:
             {{- toYaml .Values.datahubSystemUpdate.securityContext | nindent 12 }}
           volumeMounts:
           {{- with .Values.global.credentialsAndCertsSecrets }}
-          - name: datahub-certs-dir
-            mountPath: {{ .path | default "/mnt/certs" }}
+            - name: datahub-certs-dir
+              mountPath: {{ .path | default "/mnt/certs" }}
           {{- end }}
           {{- with .Values.datahubSystemUpdate.extraVolumeMounts }}
-          {{- toYaml . | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           resources:
             {{- toYaml .Values.datahubSystemUpdate.resources | nindent 12 }}
         {{- with .Values.datahubSystemUpdate.extraSidecars }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with default .Values.global.nodeSelector .Values.datahubSystemUpdate.nodeSelector }}
       nodeSelector:

diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml
@@ -376,7 +376,11 @@ datahubSystemUpdate:
   nonblocking:
     enabled: true
     # When mode = 'nonblocking' the nonblocking job should not include the above helm.sh/hook annotations
-    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-delete-policy: before-hook-creation
     image:
       args:
       # Add custom command / arguments to this job.  Useful if you need a custom startup or shutdown script