Merge branch 'master' into feature/ui

feature/ui
Karolis Rusenas 2019-05-11 10:07:37 +01:00
commit e583024902
3 changed files with 7 additions and 1 deletions

View File

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

View File

@ -68,6 +68,11 @@ spec:
value: "{{ .Values.gcr.projectId }}" value: "{{ .Values.gcr.projectId }}"
- name: PUBSUB - name: PUBSUB
value: "1" 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 }} {{- end }}
{{- if .Values.ecr.enabled }} {{- if .Values.ecr.enabled }}
# Enable AWS ECR # Enable AWS ECR

View File

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