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
2021-08-09 09:08:36 -07:00 · 2021-08-09 09:08:36 -07:00 · e79323f5e1
parent cd1b3dff9d
commit e79323f5e1
14 changed files with 14 additions and 14 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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':
--- 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
--- 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
--- 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
--- 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 {