airship
/
promenade
Code Issues Proposed changes

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
This commit is contained in:
Drew Walters 2019-03-26 17:13:48 +00:00
parent 9628da8cf4
commit c178634b89
16 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration/genesis.rst
View File

@ -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

2
doc/source/configuration/host-system.rst
View File

@ -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:

2
examples/basic/Genesis.yaml
View File

@ -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

2
examples/basic/HostSystem.yaml
View File

@ -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:

2
examples/basic/armada-resources.yaml
View File

@ -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

2
examples/complete/Genesis.yaml
View File

@ -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

2
examples/complete/HostSystem.yaml
View File

@ -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:

2
examples/complete/armada-resources.yaml
View File

@ -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

4
tests/unit/api/test_validatedesign.py
View File

@ -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':

2
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -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

2
tests/unit/builder_data/simple/HostSystem.yaml
View File

@ -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:

2
tests/unit/builder_data/simple/armada-resources.yaml
View File

@ -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

4
tools/gate/default-config-env
View File

@ -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

2
tools/helm_install.sh
View File

@ -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 {

3
tools/helm_tk.sh
View File

@ -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

4
tools/registry/IMAGES
View File

@ -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