Browse Source

Update tiller version to 2.10.0

This also makes a corresponding update to the Makefile to address a bug
with which $(HELM) is being used that was exposed during local testing.

Change-Id: I08da45c1f232960c58ab482053befed83da6fdd6
Mark Burnett 7 months ago
parent
commit
0233c30ffb

+ 1
- 3
Makefile View File

@@ -14,10 +14,10 @@
14 14
 
15 15
 BUILD_DIR         := $(shell mktemp -d)
16 16
 DOCKER_REGISTRY   ?= quay.io
17
+HELM              := $(BUILD_DIR)/helm
17 18
 IMAGE_PREFIX      ?= airshipit
18 19
 IMAGE_NAME        ?= promenade
19 20
 IMAGE_TAG         ?= latest
20
-HELM              ?= helm
21 21
 PROXY             ?= http://proxy.foo.com:8000
22 22
 NO_PROXY          ?= localhost,127.0.0.1,.svc.cluster.local
23 23
 USE_PROXY         ?= false
@@ -28,8 +28,6 @@ CHARTS            := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
28 28
 IMAGE             := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
29 29
 PYTHON_BASE_IMAGE ?= python:3.6
30 30
 
31
-HELM := $(BUILD_DIR)/helm
32
-HELM ?= helm
33 31
 HELM_PIDFILE ?= $(abspath ./.helm-pid)
34 32
 
35 33
 CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.))

+ 1
- 1
examples/basic/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.9.1
35
+      tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
36 36
     kubernetes:
37 37
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
38 38
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2

+ 1
- 1
examples/basic/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.9.1
36
+      helm: lachlanevenson/k8s-helm:v2.10.0
37 37
     kubernetes:
38 38
       kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
39 39
   packages:

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

@@ -1151,7 +1151,7 @@ data:
1151 1151
   values:
1152 1152
     images:
1153 1153
       tags:
1154
-        tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
1154
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
1155 1155
     labels:
1156 1156
       node_selector_key: ucp-control-plane
1157 1157
       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.9.1
33
+      tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
34 34
     kubernetes:
35 35
       apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
36 36
       controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2

+ 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.9.1
36
+      helm: lachlanevenson/k8s-helm:v2.10.0
37 37
     kubernetes:
38 38
       kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
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.9.1
1690
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
1691 1691
     labels:
1692 1692
       node_selector_key: ucp-control-plane
1693 1693
       node_selector_value: enabled

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

@@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.2
7 7
 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
8 8
 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14
9 9
 IMAGE_HAPROXY=haproxy:1.8.3
10
-IMAGE_HELM=lachlanevenson/k8s-helm:v2.9.1
10
+IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0
11 11
 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2
12
-IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.9.1
12
+IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0
13 13
 KUBELET_URL=https://dl.k8s.io/v1.10.2/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.9.1-linux-amd64.tar.gz"}
20
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.10.0-linux-amd64.tar.gz"}
21 21
 
22 22
 
23 23
 function install_helm_binary {

+ 2
- 2
tools/registry/IMAGES View File

@@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.10.2,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.9.1,tiller
8
-lachlanevenson/k8s-helm,v2.9.1,helm
7
+gcr.io/kubernetes-helm/tiller,v2.10.0,tiller
8
+lachlanevenson/k8s-helm,v2.10.0,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