Merge "Update to Helm 2.9.1"

This commit is contained in:
Zuul 2018-08-07 18:01:33 +00:00 committed by Gerrit Code Review
commit 7a06bef72c
8 changed files with 10 additions and 10 deletions

View File

@ -39,7 +39,7 @@ Here is a complete sample document:
images:
armada: quay.io/attcomdev/armada:latest
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2

View File

@ -22,7 +22,7 @@ Sample Document
images:
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v2.7.2
helm: lachlanevenson/k8s-helm:v2.9.1
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
packages:

View File

@ -33,7 +33,7 @@ data:
images:
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v2.7.2
helm: lachlanevenson/k8s-helm:v2.9.1
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
packages:

View File

@ -33,7 +33,7 @@ data:
images:
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v2.7.2
helm: lachlanevenson/k8s-helm:v2.9.1
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
packages:

View File

@ -103,7 +103,7 @@ VALID_DOCS = [
'images': {
'armada': 'quay.io/airshipit/armada:master',
'helm': {
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.7.2'
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.9.1'
},
'kubernetes': {
'apiserver':
@ -160,7 +160,7 @@ VALID_DOCS = [
'images': {
'haproxy': 'haproxy:1.8.3',
'helm': {
'helm': 'lachlanevenson/k8s-helm:v2.7.2'
'helm': 'lachlanevenson/k8s-helm:v2.9.1'
},
'kubernetes': {
'kubectl':

View File

@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.2
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2
IMAGE_HELM=lachlanevenson/k8s-helm:v2.9.1
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.9.1
KUBELET_URL=https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz

View File

@ -17,7 +17,7 @@
set -x
HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.7.2-linux-amd64.tar.gz"}
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz"}
function install_helm_binary {

View File

@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.10.2,hyperkube
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
gcr.io/kubernetes-helm/tiller,v2.7.2,tiller
lachlanevenson/k8s-helm,v2.7.2,helm
gcr.io/kubernetes-helm/tiller,v2.9.1,tiller
lachlanevenson/k8s-helm,v2.9.1,helm
quay.io/airshipit/armada,master,armada
quay.io/calico/cni,v1.11.0,calico-cni
quay.io/calico/ctl,v1.6.1,calico-ctl