Merge "Update helm and tiller to 2.7.2"

This commit is contained in:
Felipe Monteiro 2018-01-05 09:13:11 -05:00 committed by Gerrit Code Review
commit 4bd3751578
8 changed files with 10 additions and 10 deletions

View File

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

View File

@ -22,7 +22,7 @@ Sample Document
images:
coredns: coredns/coredns:011
helm:
helm: lachlanevenson/k8s-helm:v2.5.1
helm: lachlanevenson/k8s-helm:v2.7.2
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.0
packages:

View File

@ -21,7 +21,7 @@ data:
images:
armada: quay.io/attcomdev/armada:latest
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.5.1
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.0
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.8.0

View File

@ -32,7 +32,7 @@ data:
images:
coredns: coredns/coredns:0.9.9
helm:
helm: lachlanevenson/k8s-helm:v2.5.1
helm: lachlanevenson/k8s-helm:v2.7.2
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.0
packages:

View File

@ -26,7 +26,7 @@ data:
images:
armada: quay.io/attcomdev/armada:latest
helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.5.1
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.0
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.8.0

View File

@ -32,7 +32,7 @@ data:
images:
coredns: coredns/coredns:0.9.9
helm:
helm: lachlanevenson/k8s-helm:v2.5.1
helm: lachlanevenson/k8s-helm:v2.7.2
kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.0
packages:

View File

@ -6,7 +6,7 @@ IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.1
IMAGE_COREDNS=coredns/coredns:0.9.9
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.0.17
IMAGE_HELM=lachlanevenson/k8s-helm:v2.5.1
IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.8.0
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.5.1
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.7.2
KUBELET_URL=https://dl.k8s.io/v1.8.0/kubernetes-node-linux-amd64.tar.gz

View File

@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.8.0,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.5.1,tiller
lachlanevenson/k8s-helm,v2.5.1,helm
gcr.io/kubernetes-helm/tiller,v2.7.2,tiller
lachlanevenson/k8s-helm,v2.7.2,helm
quay.io/attcomdev/armada,latest,armada
quay.io/calico/cni,v1.11.0,calico-cni
quay.io/calico/ctl,v1.6.1,calico-ctl