Merge "Update to Helm v2.3.0"

This commit is contained in:
Jenkins 2017-04-10 14:02:33 +00:00 committed by Gerrit Code Review
commit 9224e8ceec
5 changed files with 4 additions and 8 deletions

View File

@ -17,7 +17,7 @@ import sys
def helm_dep_up(srcdir):
command_line = "cd %s; helm dep up" % (srcdir)
command_line = "cd %s; helm dep up --skip-refresh" % (srcdir)
try:
res = subprocess.check_output(
command_line, shell=True,

View File

@ -137,7 +137,7 @@ common_create_keystone_admin = [
def helm_dep_up(srcdir):
command_line = "cd %s; helm dep up" % (srcdir)
command_line = "cd %s; helm dep up --skip-refresh" % (srcdir)
try:
res = subprocess.check_output(
command_line, shell=True,

View File

@ -17,7 +17,7 @@ import sys
def helm_dep_up(srcdir):
command_line = "cd %s; helm dep up" % (srcdir)
command_line = "cd %s; helm dep up --skip-refresh" % (srcdir)
try:
res = subprocess.check_output(
command_line, shell=True,

View File

@ -1,4 +1,4 @@
HELM_VERSION="2.2.2"
HELM_VERSION="2.3.0"
HELM_TEMPLATE_URL="https://github.com/technosophos/helm-template/releases/download/2.2.2%2B1/helm-template-linux-2.2.2.1.tgz"
HELM_URL="http://storage.googleapis.com/kubernetes-helm/helm-v$HELM_VERSION-linux-amd64.tar.gz"

View File

@ -108,10 +108,6 @@ fi
function setup_helm_common {
tools/setup_helm.sh
# FIXME removing stable repo as dep up gets refreshed way too frequently
# before helm 2.3.x. https://github.com/kubernetes/helm/pull/2021
helm repo remove stable
tools/helm_build_all.sh ~/.helm/repository/kolla
tools/helm_buildrepo.sh ~/.helm/repository/kolla 10192 kolla &
helm update