airship
/
armada
Code Issues Proposed changes

Merge "Revert "Move to helm 2.14""

This commit is contained in:
Zuul 2019-06-05 21:10:13 +00:00 committed by Gerrit Code Review
parent d2bab9fa7d e51db14add
commit 2f28fb5bf0
6 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
armada/handlers/tiller.py
View File

@ -37,7 +37,7 @@ from armada.handlers import schema
from armada.utils import helm
from armada.utils.release import label_selectors, get_release_status
TILLER_VERSION = b'2.14.0'
TILLER_VERSION = b'2.13.1'
GRPC_EPSILON = 60
LIST_RELEASES_PAGE_SIZE = 32
LIST_RELEASES_ATTEMPTS = 3

2
charts/armada/values.yaml
View File

@ -31,7 +31,7 @@ images:
ks_service: 'docker.io/openstackhelm/heat:newton'
ks_user: 'docker.io/openstackhelm/heat:newton'
image_repo_sync: docker.io/docker:17.07.0
tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1
pull_policy: "IfNotPresent"
local_registry:
active: false

2
charts/tiller/values.yaml
View File

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

74
hapi/services/tiller_pb2.py
View File

File diff suppressed because one or more lines are too long

2
tools/helm-hapi.sh
View File

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

2
tools/helm_install.sh
View File

@ -17,7 +17,7 @@
set -x
HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.14.0-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 {