Merge branch 'master' of github.com:keel-hq/keel

pull/407/head
Karolis Rusenas 2019-06-14 12:23:52 +01:00
commit d09bd3698f
4 changed files with 9 additions and 9 deletions

View File

@ -1,9 +1,9 @@
apiVersion: v1
name: keel
description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight.
version: 0.8.5
version: 0.8.6
# Note that we use appVersion to get images tag, so make sure this is correct.
appVersion: 0.14.0
appVersion: 0.14.3-rc1
keywords:
- kubernetes deployment
- helm release

View File

@ -63,8 +63,8 @@ spec:
# Enable/disable Helm provider
- name: HELM_PROVIDER
value: "1"
- name: TILLER_ADDRESS
value: "{{ .Values.helmProvider.tillerAddress }}"
- name: TILLER_NAMESPACE
value: "{{ .Values.helmProvider.tillerNamespace }}"
{{- end }}
{{- if .Values.gcr.enabled }}
# Enable GCR with pub/sub support

View File

@ -4,7 +4,7 @@
image:
repository: keelhq/keel
tag: 0.14.2
tag: 0.14.3-rc1
pullPolicy: IfNotPresent
# Enable insecure registries
@ -18,7 +18,7 @@ polling:
# Helm provider support
helmProvider:
enabled: true
tillerAddress: "tiller-deploy.kube-system.svc.cluster.local:44134"
tillerNamespace: "kube-system"
# Google Container Registry
# GCP Project ID

View File

@ -163,11 +163,11 @@ spec:
- name: AUTHENTICATED_WEBHOOKS
value: "{{ .authenticated_webhooks | default "false" }}"
# Helm configuration
{{ if.tiller_address }}
{{ if.tiller_namespace }}
- name: HELM_PROVIDER
value: "1"
- name: TILLER_ADDRESS
value: "{{ .tiller_address }}"
- name: TILLER_NAMESPACE
value: "{{ .tiller_namespace }}"
{{ end}}
# Enable AWS ECR
- name: AWS_ACCESS_KEY_ID