Merge "tools: Update Helm to v2.13.1"

armada/handlers/tiller.py

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

charts/tiller/values.yaml

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

hapi/services/tiller_pb2_grpc.py

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

tools/helm-hapi.sh

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

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

tools/helm_tk.sh

@@ -22,8 +22,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