airship/armada
Code Issues Proposed changes

tools: Update Helm to v2.13.1

Browse Source 
Helm v2.13.1 has been released [0], and is the next version of Helm
Armada is compatible with. Currently, Armada is not compatible with the
latest version of Helm toolkit due to a divergence caused in Helm v2.13.
This change uplifts Helm to v2.13.1 to restore compatibility with the
latest version of Helm toolkit.

[0] https://github.com/helm/helm/releases/tag/v2.13.1

Change-Id: Ieaf2475562c56530b6ec69c6a43611b4b47b7c83
This commit is contained in:
Drew Walters 2019-03-26 16:53:15 +00:00
parent 48920224cc
commit 12f4e8d2c3
7 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
armada/handlers/tiller.py
View File

@ -35,7 +35,7 @@ from armada.handlers.k8s import K8s
from armada.utils import helm from armada.utils import helm
from armada.utils.release import label_selectors, get_release_status 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 GRPC_EPSILON = 60
LIST_RELEASES_PAGE_SIZE = 32 LIST_RELEASES_PAGE_SIZE = 32
LIST_RELEASES_ATTEMPTS = 3 LIST_RELEASES_ATTEMPTS = 3

2
charts/tiller/values.yaml
View File

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

81
hapi/services/tiller_pb2.py
View File

File diff suppressed because one or more lines are too long

2
hapi/services/tiller_pb2_grpc.py
View File

@ -156,7 +156,7 @@ class ReleaseServiceServicer(object):
raise NotImplementedError('Method not implemented!') raise NotImplementedError('Method not implemented!')
def GetHistory(self, request, context): 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_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details('Method not implemented!') context.set_details('Method not implemented!')

2
tools/helm-hapi.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 git clone https://github.com/helm/helm ./helm -b $HELM_BRANCH

2
tools/helm_install.sh
View File

@ -17,7 +17,7 @@
set -x set -x
HELM=$1 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 { function install_helm_binary {

3
tools/helm_tk.sh
View File

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