[stable/spinnaker] Fix kubeconfig s3 bucket configuration in spinnaker chart

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: 2.0.0-rc4
+version: 2.0.0-rc5
 appVersion: 1.16.2
 home: http://spinnaker.io/
 sources:

stable/spinnaker/templates/hooks/install-using-hal.yaml

@@ -25,7 +25,7 @@ spec:
       {{- end }}
       restartPolicy: OnFailure
       volumes:
-      {{- if .Values.kubeConfig.enabled }}
+      {{- if and .Values.kubeConfig.enabled .Values.kubeConfig.secretName }}
       - name: kube-config
         secret:
           secretName: {{ .Values.kubeConfig.secretName }}
@@ -116,7 +116,7 @@ spec:
         - name: s3-secrets
           mountPath: /opt/s3
         {{- end }}
-        {{- if .Values.kubeConfig.enabled }}
+        {{- if and .Values.kubeConfig.enabled .Values.kubeConfig.secretName }}
         - name: kube-config
           mountPath: /opt/kube
         {{- end }}

stable/spinnaker/templates/statefulsets/halyard.yaml

@@ -68,7 +68,7 @@ spec:
       - name: halyard-home
         emptyDir: {}
       {{- end }}
-      {{- if .Values.kubeConfig.enabled }}
+      {{- if and .Values.kubeConfig.enabled .Values.kubeConfig.secretName }}
       - name: kube-config
         secret:
           secretName: {{ .Values.kubeConfig.secretName }}
@@ -166,7 +166,7 @@ spec:
         - name: s3-secrets
           mountPath: /opt/s3
         {{- end }}
-        {{- if .Values.kubeConfig.enabled }}
+        {{- if and .Values.kubeConfig.enabled .Values.kubeConfig.secretName }}
         - name: kube-config
           mountPath: /opt/kube
         {{- end }}

stable/spinnaker/values.yaml

@@ -164,8 +164,8 @@ kubeConfig:
   # Use this when you want to register arbitrary clusters with Spinnaker
   # Upload your ~/kube/.config to a secret
   enabled: false
-  secretName: my-kubeconfig
-  secretKey: config
+  # secretName: my-kubeconfig
+  # secretKey: config
   # Use this when you want to configure halyard to reference a kubeconfig from s3
   # This allows you to keep your kubeconfig in an encrypted s3 bucket
   # For more info visit: