From 62d2cef638100765abc664be437f140b8ed53cd6 Mon Sep 17 00:00:00 2001 From: Samuel Pilla Date: Tue, 3 Dec 2019 09:38:16 -0600 Subject: [PATCH] Upgrade Tiller version for k8s 1.16 Upgrade Tiller to v2.16.1 Change-Id: I38d5d6921ac4cc020661e1c3471e25190baa500a --- doc/source/configuration/genesis.rst | 2 +- examples/basic/Genesis.yaml | 2 +- examples/basic/armada-resources.yaml | 2 +- examples/complete/Genesis.yaml | 2 +- examples/complete/armada-resources.yaml | 2 +- examples/containerd/Genesis.yaml | 2 +- examples/containerd/armada-resources.yaml | 2 +- examples/gate/Genesis.yaml | 2 +- examples/gate/armada-resources.yaml | 2 +- tests/unit/api/test_validatedesign.py | 2 +- tests/unit/builder_data/simple/Genesis.yaml | 2 +- tests/unit/builder_data/simple/armada-resources.yaml | 2 +- tools/gate/default-config-env | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index 178fab88..c73adcd1 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -46,7 +46,7 @@ Here is a complete sample document: images: armada: quay.io/airshipit/armada:latest helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index ecdef60b..1c3166c2 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -51,7 +51,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_xenial helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index ec59d033..fe11d98f 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -1140,7 +1140,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.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 699e9f5b..2baea48c 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -37,7 +37,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_xenial helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index ed9d9170..45f26cb9 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -1686,7 +1686,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 98c37243..5967c913 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -51,7 +51,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_xenial helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 3ff8dec9..88b0bcec 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -927,7 +927,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index b2207ae3..5faf8cbe 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -51,7 +51,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_xenial helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index d3b2d16f..269884e8 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -927,7 +927,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 6906c2e3..9bf06325 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -103,7 +103,7 @@ VALID_DOCS = [ 'images': { 'armada': 'quay.io/airshipit/armada:master-ubuntu_xenial', 'helm': { - 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.14.0' + 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.16.1' }, 'kubernetes': { 'apiserver': diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 00f5e862..a4f81a42 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -34,7 +34,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_xenial helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index d60e860a..a142e24c 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -977,7 +977,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.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 8dca38bb..a851bdb5 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -9,5 +9,5 @@ IMAGE_ETCD=quay.io/coreos/etcd:v3.4.2 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6 -IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.14.0 +IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz