[stable/spinnaker] add external secret support for GCS (#10716)

* [stable/spinnaker] add external secret support for GCS

Allow user to supply their own pre-created secret for GCS storage

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>

* fix faulty if statements

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>

stable/spinnaker/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
 name: spinnaker
-version: 1.1.8
+version: 1.2.0
 appVersion: 1.9.1
 home: http://spinnaker.io/
 sources:

stable/spinnaker/templates/secrets/gcs.yaml

@@ -1,8 +1,12 @@
-{{ if .Values.gcs.enabled }}
+{{ if and .Values.gcs.enabled .Values.gcs.jsonKey }}
 apiVersion: v1
 kind: Secret
 metadata:
+{{- if .Values.gcs.secret }}
+  name: {{ .Values.gcs.secret }}
+{{- else }}
   name: {{ template "spinnaker.fullname" . }}-gcs
+{{- end }}
   labels:
 {{ include "spinnaker.standard-labels" . | indent 4 }}
     component: halyard

stable/spinnaker/templates/statefulsets/halyard.yaml

@@ -54,7 +54,11 @@ spec:
       {{- if .Values.gcs.enabled }}
       - name: gcs-key
         secret:
+        {{- if .Values.gcs.secretName }}
+          secretName: {{ .Values.gce.secretName }}
+        {{- else }}
           secretName: {{ template "spinnaker.fullname" . }}-gcs
+        {{- end }}
       {{- end }}
       - name: reg-secrets
         secret:

stable/spinnaker/values.yaml

@@ -131,7 +131,12 @@ gcs:
   enabled: false
   project: my-project-name
   bucket: "<GCS-BUCKET-NAME>"
+  ## if jsonKey is set, will create a secret containing it
   jsonKey: '<INSERT CLOUD STORAGE JSON HERE>'
+  ## override the name of the secret to use for jsonKey, if `jsonKey`
+  ## is empty, it will not create a secret assuming you are creating one
+  ## external to the chart. the key for that secret should be `key.json`.
+  secretName:
 
 # AWS Simple Storage Service
 s3: