From e79323f5e185a10148ce4f23cdea4495af7fa049 Mon Sep 17 00:00:00 2001 From: "anthony.bellino" Date: Mon, 9 Aug 2021 09:08:36 -0700 Subject: [PATCH] Uplift tiller and helm install script to v2.17.0 Uplifting tiller image to ghcr.io/helm/tiller:v2.17.0 since v2.16.1 is not available anymore Update the helm installation script to download and install v2.17.0 Change-Id: I92a7fe096a32377e155a298dc258bc2f4b93a2c1 --- 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 +- tools/helm_install.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index eaa57f17..d24b35a2 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.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index a0ad11f5..8e283d76 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -48,7 +48,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 3ace2f1e..ba913492 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -1146,7 +1146,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 9f1964a5..bd39e583 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -37,7 +37,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index bcf19327..7b4e28ba 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -1692,7 +1692,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 9ba1226a..a5b76c9c 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -48,7 +48,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index b603712a..1c6c5c11 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -934,7 +934,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 9ba1226a..a5b76c9c 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -48,7 +48,7 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index 6ca35be1..ee1d0a54 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -940,7 +940,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 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 69c25644..c6cb331d 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_bionic', 'helm': { - 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.16.1' + 'tiller': 'ghcr.io/helm/tiller:v2.17.0' }, 'kubernetes': { 'apiserver': diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 731238eb..db55d675 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_bionic helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 kubernetes: apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index d4d5518f..e675a01d 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -984,7 +984,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: ghcr.io/helm/tiller:v2.17.0 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 690a0ed3..976c35a6 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -13,5 +13,5 @@ IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.20.5 IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.20.5 IMAGE_ANCHOR=cwedgwood/kubectl:v1.20.5-1 -IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 +IMAGE_TILLER=ghcr.io/helm/tiller:v2.17.0 KUBELET_URL=https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 85a4e18b..3b9061c0 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz"} function install_helm_binary {