From c2d7ec9bc3835a2763f7ca0ea04d57c0b03f6bb9 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Thu, 6 Apr 2017 15:33:51 -0700 Subject: [PATCH] Update to Helm v2.3.0 This PS updates Helm to v2.3.0 and removes a workaround for a performance issue in v2.2.x. Change-Id: If60683a32b4ec67a17a56058acda54f29de4e393 --- tools/helm_prebuild_compute_kits.py | 2 +- tools/helm_prebuild_microservices.py | 2 +- tools/helm_prebuild_services.py | 2 +- tools/helm_versions.sh | 2 +- tools/setup_gate_common.sh | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/helm_prebuild_compute_kits.py b/tools/helm_prebuild_compute_kits.py index f3013727f..04ced4f99 100755 --- a/tools/helm_prebuild_compute_kits.py +++ b/tools/helm_prebuild_compute_kits.py @@ -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, diff --git a/tools/helm_prebuild_microservices.py b/tools/helm_prebuild_microservices.py index e04149c7a..a0fa8937c 100755 --- a/tools/helm_prebuild_microservices.py +++ b/tools/helm_prebuild_microservices.py @@ -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, diff --git a/tools/helm_prebuild_services.py b/tools/helm_prebuild_services.py index bcfdbf51d..36e4df4e3 100755 --- a/tools/helm_prebuild_services.py +++ b/tools/helm_prebuild_services.py @@ -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, diff --git a/tools/helm_versions.sh b/tools/helm_versions.sh index 0b157b598..04ecb6442 100644 --- a/tools/helm_versions.sh +++ b/tools/helm_versions.sh @@ -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" diff --git a/tools/setup_gate_common.sh b/tools/setup_gate_common.sh index b710c41d6..3e6736863 100755 --- a/tools/setup_gate_common.sh +++ b/tools/setup_gate_common.sh @@ -107,10 +107,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