Update tiller to be compatible with latest Armada
Change-Id: If5d2527240948c0628dfbb76b658f7ad05395ab5
This commit is contained in:
parent
12b3c4627e
commit
7797aadb8b
|
@ -32,7 +32,7 @@ data:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:master
|
armada: quay.io/airshipit/armada:master
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
|
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
||||||
|
|
|
@ -1151,7 +1151,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
|
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
||||||
labels:
|
labels:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
|
@ -30,7 +30,7 @@ data:
|
||||||
images:
|
images:
|
||||||
armada: quay.io/airshipit/armada:master
|
armada: quay.io/airshipit/armada:master
|
||||||
helm:
|
helm:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
|
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
||||||
kubernetes:
|
kubernetes:
|
||||||
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
||||||
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
|
||||||
|
|
|
@ -1687,7 +1687,7 @@ data:
|
||||||
values:
|
values:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
|
tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
|
||||||
labels:
|
labels:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
|
@ -9,5 +9,5 @@ IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
|
||||||
IMAGE_HAPROXY=haproxy:1.8.3
|
IMAGE_HAPROXY=haproxy:1.8.3
|
||||||
IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2
|
IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2
|
||||||
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.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
|
KUBELET_URL=https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
|
||||||
|
|
Loading…
Reference in New Issue