From ba3aacf6a91ddf1e6536444701647a9b29a3f146 Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Thu, 2 Aug 2018 16:19:57 -0500 Subject: [PATCH] Update to Helm 2.9.1 Update all Helm and Tiller references to 2.9.1, which has fixes for template rendering bugs. Some references are already updated, and this PS updates the rest. Change-Id: Id617cc866d09f5cb3708fcf329a21bc60e17ce45 --- doc/source/configuration/genesis.rst | 2 +- doc/source/configuration/host-system.rst | 2 +- examples/basic/HostSystem.yaml | 2 +- examples/complete/HostSystem.yaml | 2 +- tests/unit/api/test_validatedesign.py | 4 ++-- tools/gate/default-config-env | 2 +- tools/helm_install.sh | 2 +- tools/registry/IMAGES | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index d23bee2a..81018dcd 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/attcomdev/armada:latest 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/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index e9a9f95d..3152d941 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.7.2 + helm: lachlanevenson/k8s-helm:v2.9.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 packages: diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index 05255902..90055c7a 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -33,7 +33,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.7.2 + helm: lachlanevenson/k8s-helm:v2.9.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 packages: diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index c84c4afb..20ba4f1a 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.7.2 + helm: lachlanevenson/k8s-helm:v2.9.1 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 packages: diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 0bc117e9..208e5410 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.7.2' + 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.9.1' }, 'kubernetes': { 'apiserver': @@ -160,7 +160,7 @@ VALID_DOCS = [ 'images': { 'haproxy': 'haproxy:1.8.3', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v2.7.2' + 'helm': 'lachlanevenson/k8s-helm:v2.9.1' }, 'kubernetes': { 'kubectl': diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 32e0bb3a..fada491a 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.2 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v2.7.2 +IMAGE_HELM=lachlanevenson/k8s-helm:v2.9.1 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.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 diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 15f1cf9b..f18eefb5 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.7.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 3e11e01d..efeff617 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.10.2,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.7.2,tiller -lachlanevenson/k8s-helm,v2.7.2,helm +gcr.io/kubernetes-helm/tiller,v2.9.1,tiller +lachlanevenson/k8s-helm,v2.9.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