Merge branch 'master' into feature/ui

chart/keel/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: keel
 description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight.
-version: 0.7.9
+version: 0.7.10
 # Note that we use appVersion to get images tag, so make sure this is correct.
 appVersion: 0.13.0
 keywords:

chart/keel/templates/deployment.yaml

@@ -68,6 +68,11 @@ spec:
               value: "{{ .Values.gcr.projectId }}"
             - name: PUBSUB
               value: "1"
+  {{- if .Values.gcr.clusterName }}
+            # Customize the cluster name, mainly useful when outside of GKE
+            - name: CLUSTER_NAME
+              value: "{{ .Values.gcr.clusterName }}"
+  {{- end }}
 {{- end }}
 {{- if .Values.ecr.enabled }}
             # Enable AWS ECR

chart/keel/values.yaml

@@ -25,6 +25,7 @@ helmProvider:
 gcr:
   enabled: false
   projectId: ""
+  clusterName: ""
   pubSub:
     enabled: false