Merge pull request #57 from keerthibingi/main

Relasing 2.2.18 chart wrt bitbucket config
OpsMx · Jul 10, 2024 · 21a5c01 · 21a5c01
2 parents 1a62739 + bf1a143
commit 21a5c01
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/spinnaker/Chart.yaml b/charts/spinnaker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Open source Spinnaker with v1.30.1 Gitops Support
 name: spinnaker
-version: 2.2.17
+version: 2.2.18
 appVersion: 1.30.1
 home: http://spinnaker.io/
 sources:

diff --git a/charts/spinnaker/templates/configmap/halyard-init-script.yaml b/charts/spinnaker/templates/configmap/halyard-init-script.yaml
@@ -8,7 +8,7 @@ data:
   init.sh: |
     #!/bin/bash
     {{- if .Values.halyard.gitops.enabled }}
-    {{- if and (.Values.halyard.gitops.enabled) (eq .Values.halyard.gitops.repo.type "git") }}
+    {{- if or (eq .Values.halyard.gitops.repo.type "stash") (eq .Values.halyard.gitops.repo.type "git") }}
     rm -rf /tmp/spinnaker/.hal
     secret=$(kubectl get secret opsmx-gitops-auth -n {{ .Release.Namespace }} | awk '{print $1}' | tail -n +2)
     if [[ "$secret" == "opsmx-gitops-auth" ]]; then

diff --git a/charts/spinnaker/templates/statefulsets/halyard.yaml b/charts/spinnaker/templates/statefulsets/halyard.yaml
@@ -53,7 +53,7 @@ spec:
         {{- end }}
         - /tmp/initscript/init.sh
       {{- if .Values.halyard.gitops.enabled }}
-      {{- if (eq .Values.halyard.gitops.repo.type "git") }}
+      {{- if or (eq .Values.halyard.gitops.repo.type "stash") (eq .Values.halyard.gitops.repo.type "git") }}
         env:
         - name: SPINNAKER_NAMESPACE
           valueFrom: