[stable/gce-ingress] allow key in secret to be overridden (helm#14347)

Allow user to override the key for your google.json cred in your secret

Signed-off-by: Paul Czarkowski <[email protected]>

stable/gce-ingress/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.4.0"
 description: A GCE Ingress Controller
 name: gce-ingress
-version: 1.1.2
+version: 1.2.0
 keywords:
   - ingress
   - gce

stable/gce-ingress/README.md

@@ -65,6 +65,8 @@ Parameter | Description | Default
 `defaultBackend.replicaCount` | desired number of default backend pods | `1`
 `defaultBackend.resources` | default backend pod resource requests & limits | `{}`
 `rbac.enabled` | use RBAC ? | `true`
+`secret` | the name of the secret containing your google creds json | ``
+`secretKey` | override the key containing your google creds json | ``
 
 ```console
 $ helm install stable/gce-ingress --name my-release

stable/gce-ingress/templates/deployment-controller.yaml

@@ -61,7 +61,7 @@ spec:
           secret:
             secretName: {{ .Values.secret }}
             items:
-              - key: key.json
+              - key: {{ default "key.json" .Values.secretKey }}
                 path: key.json
       {{- end }}
         - name: gce-config-volume

stable/gce-ingress/templates/service.yaml

@@ -23,10 +23,3 @@ spec:
     component: backend
     release: {{ .Release.Name }}
 
-  name: default-http-backend
-  namespace: kube-system
-  labels:
-    k8s-app: glbc
-    kubernetes.io/cluster-service: "true"
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/name: "GLBCDefaultBackend"

stable/gce-ingress/values.yaml

@@ -31,6 +31,9 @@ serviceAccount:
 #   key.json: < base64 encoded JSON service account key>
 secret: ~
 
+## If the google auth file is saved in a different secret key you can specify it here
+# secretKey: key.json
+
 # gce config, replace values to match your environment
 config:
   projectID: