From 7797aadb8b85f3ac99d129be4bdc8c14ab1221a9 Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Mon, 23 Jul 2018 12:42:23 -0500 Subject: [PATCH] Update tiller to be compatible with latest Armada Change-Id: If5d2527240948c0628dfbb76b658f7ad05395ab5 --- examples/basic/Genesis.yaml | 2 +- examples/basic/armada-resources.yaml | 2 +- examples/complete/Genesis.yaml | 2 +- examples/complete/armada-resources.yaml | 2 +- tools/gate/default-config-env | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 1579cb89..bb67666f 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -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 diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index fc4fc84d..904c17d8 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -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 diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index ed6f4b81..98036c66 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -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 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 8f945091..ad06f66f 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -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 diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index d33b0b4f..32e0bb3a 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -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