Update tiller to be compatible with latest Armada

Change-Id: If5d2527240948c0628dfbb76b658f7ad05395ab5
This commit is contained in:
Mark Burnett 2018-07-23 12:42:23 -05:00
parent 12b3c4627e
commit 7797aadb8b
5 changed files with 5 additions and 5 deletions

View File

@ -32,7 +32,7 @@ data:
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: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2

View File

@ -1151,7 +1151,7 @@ data:
values:
images:
tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
labels:
node_selector_key: ucp-control-plane
node_selector_value: enabled

View File

@ -30,7 +30,7 @@ data:
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: gcr.io/google_containers/hyperkube-amd64:v1.10.2
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2

View File

@ -1687,7 +1687,7 @@ data:
values:
images:
tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
labels:
node_selector_key: ucp-control-plane
node_selector_value: enabled

View File

@ -9,5 +9,5 @@ IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.7.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