Browse Source

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
Drew Walters 3 weeks ago
parent
commit
c178634b89

+ 1
- 1
doc/source/configuration/genesis.rst View File

@@ -39,7 +39,7 @@ Here is a complete sample document:
39 39
       images:
40 40
         armada: quay.io/airshipit/armada:latest
41 41
         helm:
42
-          tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
42
+          tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
43 43
         kubernetes:
44 44
           apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
45 45
           controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

+ 1
- 1
doc/source/configuration/host-system.rst View File

@@ -22,7 +22,7 @@ Sample Document
22 22
       images:
23 23
         haproxy: haproxy:1.8.3
24 24
         helm:
25
-          helm: lachlanevenson/k8s-helm:v2.12.1
25
+          helm: lachlanevenson/k8s-helm:v2.13.1
26 26
         kubernetes:
27 27
           kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
28 28
       packages:

+ 1
- 1
examples/basic/Genesis.yaml View File

@@ -36,7 +36,7 @@ data:
36 36
   images:
37 37
     armada: quay.io/airshipit/armada:master
38 38
     helm:
39
-      tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
39
+      tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
40 40
     kubernetes:
41 41
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
42 42
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

+ 1
- 1
examples/basic/HostSystem.yaml View File

@@ -67,7 +67,7 @@ data:
67 67
   images:
68 68
     haproxy: haproxy:1.8.3
69 69
     helm:
70
-      helm: lachlanevenson/k8s-helm:v2.12.1
70
+      helm: lachlanevenson/k8s-helm:v2.13.1
71 71
     kubernetes:
72 72
       kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
73 73
   packages:

+ 1
- 1
examples/basic/armada-resources.yaml View File

@@ -1138,7 +1138,7 @@ data:
1138 1138
   values:
1139 1139
     images:
1140 1140
       tags:
1141
-        tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
1141
+        tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
1142 1142
     labels:
1143 1143
       node_selector_key: ucp-control-plane
1144 1144
       node_selector_value: enabled

+ 1
- 1
examples/complete/Genesis.yaml View File

@@ -30,7 +30,7 @@ data:
30 30
   images:
31 31
     armada: quay.io/airshipit/armada:master
32 32
     helm:
33
-      tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
33
+      tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
34 34
     kubernetes:
35 35
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
36 36
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

+ 1
- 1
examples/complete/HostSystem.yaml View File

@@ -33,7 +33,7 @@ data:
33 33
   images:
34 34
     haproxy: haproxy:1.8.3
35 35
     helm:
36
-      helm: lachlanevenson/k8s-helm:v2.12.1
36
+      helm: lachlanevenson/k8s-helm:v2.13.1
37 37
     kubernetes:
38 38
       kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
39 39
   packages:

+ 1
- 1
examples/complete/armada-resources.yaml View File

@@ -1687,7 +1687,7 @@ data:
1687 1687
   values:
1688 1688
     images:
1689 1689
       tags:
1690
-        tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
1690
+        tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
1691 1691
     labels:
1692 1692
       node_selector_key: ucp-control-plane
1693 1693
       node_selector_value: enabled

+ 2
- 2
tests/unit/api/test_validatedesign.py View File

@@ -103,7 +103,7 @@ VALID_DOCS = [
103 103
             'images': {
104 104
                 'armada': 'quay.io/airshipit/armada:master',
105 105
                 'helm': {
106
-                    'tiller': 'gcr.io/kubernetes-helm/tiller:v2.12.1'
106
+                    'tiller': 'gcr.io/kubernetes-helm/tiller:v2.13.1'
107 107
                 },
108 108
                 'kubernetes': {
109 109
                     'apiserver':
@@ -162,7 +162,7 @@ VALID_DOCS = [
162 162
             'images': {
163 163
                 'haproxy': 'haproxy:1.8.3',
164 164
                 'helm': {
165
-                    'helm': 'lachlanevenson/k8s-helm:v2.12.1'
165
+                    'helm': 'lachlanevenson/k8s-helm:v2.13.1'
166 166
                 },
167 167
                 'kubernetes': {
168 168
                     'kubectl':

+ 1
- 1
tests/unit/builder_data/simple/Genesis.yaml View File

@@ -32,7 +32,7 @@ data:
32 32
   images:
33 33
     armada: quay.io/airshipit/armada:master
34 34
     helm:
35
-      tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
35
+      tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
36 36
     kubernetes:
37 37
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
38 38
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

+ 1
- 1
tests/unit/builder_data/simple/HostSystem.yaml View File

@@ -37,7 +37,7 @@ data:
37 37
   images:
38 38
     haproxy: haproxy:1.8.3
39 39
     helm:
40
-      helm: lachlanevenson/k8s-helm:v2.12.1
40
+      helm: lachlanevenson/k8s-helm:v2.13.1
41 41
     kubernetes:
42 42
       kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
43 43
   packages:

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

@@ -1002,7 +1002,7 @@ data:
1002 1002
   values:
1003 1003
     images:
1004 1004
       tags:
1005
-        tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
1005
+        tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
1006 1006
     labels:
1007 1007
       node_selector_key: ucp-control-plane
1008 1008
       node_selector_value: enabled

+ 2
- 2
tools/gate/default-config-env View File

@@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.3
7 7
 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
8 8
 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18
9 9
 IMAGE_HAPROXY=haproxy:1.8.3
10
-IMAGE_HELM=lachlanevenson/k8s-helm:v2.12.1
10
+IMAGE_HELM=lachlanevenson/k8s-helm:v2.13.1
11 11
 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6
12
-IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.12.1
12
+IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.13.1
13 13
 KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz

+ 1
- 1
tools/helm_install.sh View File

@@ -17,7 +17,7 @@
17 17
 set -x
18 18
 
19 19
 HELM=$1
20
-HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.12.1-linux-amd64.tar.gz"}
20
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz"}
21 21
 
22 22
 
23 23
 function install_helm_binary {

+ 1
- 2
tools/helm_tk.sh View File

@@ -20,8 +20,7 @@ HELM=${1}
20 20
 HELM_PIDFILE=${2}
21 21
 SERVE_DIR=$(mktemp -d)
22 22
 
23
-# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
24
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
23
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"200b5e902b3a176fbfbe669b6a10a254c9b50f5d"}
25 24
 
26 25
 ${HELM} init --client-only
27 26
 

+ 2
- 2
tools/registry/IMAGES View File

@@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.11.6,hyperkube
4 4
 gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64
5 5
 gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
6 6
 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
7
-gcr.io/kubernetes-helm/tiller,v2.12.1,tiller
8
-lachlanevenson/k8s-helm,v2.12.1,helm
7
+gcr.io/kubernetes-helm/tiller,v2.13.1,tiller
8
+lachlanevenson/k8s-helm,v2.13.1,helm
9 9
 quay.io/airshipit/armada,master,armada
10 10
 quay.io/calico/cni,v1.11.0,calico-cni
11 11
 quay.io/calico/ctl,v1.6.1,calico-ctl

Loading…
Cancel
Save