Merge pull request #50 from jjtowers/feat/issue-43/ovrd-jobs-cmds-1

[Issue-43] Added jobs commands override ability
OpsMx · Feb 14, 2024 · 2dd807c · 2dd807c
2 parents 386be53 + d5a8cd7
commit 2dd807c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/charts/spinnaker/templates/hooks/cleanup.yaml b/charts/spinnaker/templates/hooks/cleanup.yaml
@@ -37,9 +37,13 @@ spec:
         - name: halyard-config
           mountPath: /opt/halyard/scripts
         command:
+        {{- if .Values.halyard.additionalSettings.cleanJobCmd }}
+          {{- toYaml .Values.halyard.additionalSettings.cleanJobCmd | nindent 8 }}
+        {{- else }}
         - bash
         - -xe
         - "/opt/halyard/scripts/clean.sh"
+        {{- end}}
     {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}

diff --git a/charts/spinnaker/templates/hooks/install-using-hal.yaml b/charts/spinnaker/templates/hooks/install-using-hal.yaml
@@ -139,6 +139,10 @@ spec:
           {{- toYaml .Values.halyard.additionalVolumeMounts | nindent 8 }}
         {{- end }}
         command:
+        {{- if .Values.halyard.additionalSettings.installJobCmd }}
+          {{- toYaml .Values.halyard.additionalSettings.installJobCmd | nindent 8 }}
+        {{- else }}
         - bash
         - -xe
         - "/opt/halyard/scripts/install.sh"
+        {{- end }}
diff --git a/charts/spinnaker/values.yaml b/charts/spinnaker/values.yaml
@@ -104,6 +104,17 @@ halyard:
   #  - name: volumeMount1
   #    mountPath: /volumeMount1
 
+  additionalSettings:
+    # To override command used in insta-using-hal job
+    installJobCmd: []
+    # - echo
+    # - "Hello, World!"
+
+    # To override command used in cleanup job
+    cleanJobCmd: []
+    # - echo
+    # - "Hello, World!"
+
   ## Populate to provide a custom local BOM for Halyard to use for deployment. Read more for details:
   ## https://www.spinnaker.io/guides/operator/custom-boms/#boms-and-configuration-on-your-filesystem
   bom: ~