Browse Source

Merge "tools: Update Helm to v2.13.1"

Zuul 3 weeks ago
parent
commit
37249f3492

+ 1
- 1
armada/handlers/tiller.py View File

@@ -35,7 +35,7 @@ from armada.handlers.k8s import K8s
35 35
 from armada.utils import helm
36 36
 from armada.utils.release import label_selectors, get_release_status
37 37
 
38
-TILLER_VERSION = b'2.12.1'
38
+TILLER_VERSION = b'2.13.1'
39 39
 GRPC_EPSILON = 60
40 40
 LIST_RELEASES_PAGE_SIZE = 32
41 41
 LIST_RELEASES_ATTEMPTS = 3

+ 1
- 1
charts/tiller/values.yaml View File

@@ -20,7 +20,7 @@ dependencies:
20 20
 
21 21
 images:
22 22
   tags:
23
-    tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
23
+    tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
24 24
   pull_policy: "IfNotPresent"
25 25
   local_registry:
26 26
     # NOTE(portdirect): this tiller chart does not support image pulling

+ 51
- 30
hapi/services/tiller_pb2.py
File diff suppressed because it is too large
View File


+ 1
- 1
hapi/services/tiller_pb2_grpc.py View File

@@ -156,7 +156,7 @@ class ReleaseServiceServicer(object):
156 156
     raise NotImplementedError('Method not implemented!')
157 157
 
158 158
   def GetHistory(self, request, context):
159
-    """ReleaseHistory retrieves a releasse's history.
159
+    """ReleaseHistory retrieves a release's history.
160 160
     """
161 161
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
162 162
     context.set_details('Method not implemented!')

+ 1
- 1
tools/helm-hapi.sh View File

@@ -1,6 +1,6 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-HELM_BRANCH='release-2.12'
3
+HELM_BRANCH='v2.13.1'
4 4
 
5 5
 git clone https://github.com/helm/helm ./helm -b $HELM_BRANCH
6 6
 

+ 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

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

Loading…
Cancel
Save