From c178634b89cad626b99da31038a4d26545d3428e Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Tue, 26 Mar 2019 17:13:48 +0000 Subject: [PATCH] tools: Update Helm to v2.13.1 Helm v2.13.1 has been released [0]. This change uplifts Helm to v2.13.1 and restores usage of the latest Helm toolkit to match other Airship projects. [0] https://github.com/helm/helm/releases/tag/v2.13.1 Depends-On: https://review.openstack.org/647812 Change-Id: I4299a8736e0cedf7b15950614a4d72fcfd893a2d --- doc/source/configuration/genesis.rst | 2 +- doc/source/configuration/host-system.rst | 2 +- examples/basic/Genesis.yaml | 2 +- examples/basic/HostSystem.yaml | 2 +- examples/basic/armada-resources.yaml | 2 +- examples/complete/Genesis.yaml | 2 +- examples/complete/HostSystem.yaml | 2 +- examples/complete/armada-resources.yaml | 2 +- tests/unit/api/test_validatedesign.py | 4 ++-- tests/unit/builder_data/simple/Genesis.yaml | 2 +- tests/unit/builder_data/simple/HostSystem.yaml | 2 +- tests/unit/builder_data/simple/armada-resources.yaml | 2 +- tools/gate/default-config-env | 4 ++-- tools/helm_install.sh | 2 +- tools/helm_tk.sh | 3 +-- tools/registry/IMAGES | 4 ++-- 16 files changed, 19 insertions(+), 20 deletions(-) diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index c8d1bc33..acd31e0f 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -39,7 +39,7 @@ Here is a complete sample document: images: armada: quay.io/airshipit/armada:latest helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index ccf4355c..f0898a2e 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -22,7 +22,7 @@ Sample Document images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.12.1 + helm: lachlanevenson/k8s-helm:v2.13.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 packages: diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index d9aa2290..560b057e 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -36,7 +36,7 @@ data: images: armada: quay.io/airshipit/armada:master helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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/HostSystem.yaml b/examples/basic/HostSystem.yaml index 6e3a1aa8..a38b1b6a 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -67,7 +67,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.12.1 + helm: lachlanevenson/k8s-helm:v2.13.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 packages: diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 28a72e80..3a7b7927 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -1138,7 +1138,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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 6c3cff0f..75975e06 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.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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/HostSystem.yaml b/examples/complete/HostSystem.yaml index 7ac94165..0ce1ba95 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -33,7 +33,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.12.1 + helm: lachlanevenson/k8s-helm:v2.13.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 packages: diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index a1b8313f..6c89feb5 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.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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 7f2bb56d..ce824ed8 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', 'helm': { - 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.12.1' + 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.13.1' }, 'kubernetes': { 'apiserver': @@ -162,7 +162,7 @@ VALID_DOCS = [ 'images': { 'haproxy': 'haproxy:1.8.3', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v2.12.1' + 'helm': 'lachlanevenson/k8s-helm:v2.13.1' }, 'kubernetes': { 'kubectl': diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 7bf32e36..20fd0658 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -32,7 +32,7 @@ data: images: armada: quay.io/airshipit/armada:master helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index c6cd4631..99d44a62 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -37,7 +37,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.12.1 + helm: lachlanevenson/k8s-helm:v2.13.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 packages: diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index 106b2813..dfe30a96 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -1002,7 +1002,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.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 bba4df73..027fc580 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.3 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v2.12.1 +IMAGE_HELM=lachlanevenson/k8s-helm:v2.13.1 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6 -IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.12.1 +IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.13.1 KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/helm_install.sh b/tools/helm_install.sh index f1f1dc43..7af4ca5f 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.12.1-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index ca4aed81..225f7757 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -20,8 +20,7 @@ HELM=${1} HELM_PIDFILE=${2} SERVE_DIR=$(mktemp -d) -# TODO: Set this back to "master" when uplifting armada to helm 2.13.1. -HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"200b5e902b3a176fbfbe669b6a10a254c9b50f5d"} ${HELM} init --client-only diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index f8d29ca4..2d102b5e 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.11.6,hyperkube gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 -gcr.io/kubernetes-helm/tiller,v2.12.1,tiller -lachlanevenson/k8s-helm,v2.12.1,helm +gcr.io/kubernetes-helm/tiller,v2.13.1,tiller +lachlanevenson/k8s-helm,v2.13.1,helm quay.io/airshipit/armada,master,armada quay.io/calico/cni,v1.11.0,calico-cni quay.io/calico/ctl,v1.6.1,calico-ctl