From 7c1865b7db19920a32a6f679f66de373c98ef256 Mon Sep 17 00:00:00 2001 From: "SPEARS, DUSTIN (ds443n)" Date: Fri, 15 Mar 2024 14:04:42 -0400 Subject: [PATCH] Update helm to v3.14.2 Change-Id: I6952261625d74a7a2205b34b3fe08b02afab6089 --- .zuul.yaml | 4 ++-- Makefile | 2 +- tools/gate/roles/airship-run-script-set/defaults/main.yaml | 2 +- tools/gate/roles/airship-run-script-set/tasks/main.yaml | 2 +- tools/gate/roles/airship-run-script/defaults/main.yaml | 2 +- tools/gate/roles/airship-run-script/tasks/main.yaml | 2 +- tools/helm_install.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 194bec73..17a8ada2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -152,7 +152,7 @@ parent: armada-base vars: site: airskiff - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz + HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 @@ -193,7 +193,7 @@ # vars: # CLONE_ARMADA: false # ARMADA_IMAGE_DISTRO: ubuntu_focal -# HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz +# HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz # HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f # OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f # OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 diff --git a/Makefile b/Makefile index 2a137d27..f35f0635 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TA UBUNTU_BASE_IMAGE ?= # Helm binary download url -HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz +HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz # VERSION INFO GIT_COMMIT = $(shell git rev-parse HEAD) diff --git a/tools/gate/roles/airship-run-script-set/defaults/main.yaml b/tools/gate/roles/airship-run-script-set/defaults/main.yaml index 725f4b23..7e82fd6b 100644 --- a/tools/gate/roles/airship-run-script-set/defaults/main.yaml +++ b/tools/gate/roles/airship-run-script-set/defaults/main.yaml @@ -19,7 +19,7 @@ osh_params: container_distro_version: focal # feature_gates: site: airskiff -HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz +HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 diff --git a/tools/gate/roles/airship-run-script-set/tasks/main.yaml b/tools/gate/roles/airship-run-script-set/tasks/main.yaml index 4129a2c1..e180c1dc 100644 --- a/tools/gate/roles/airship-run-script-set/tasks/main.yaml +++ b/tools/gate/roles/airship-run-script-set/tasks/main.yaml @@ -35,7 +35,7 @@ FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" + HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz') }}" HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" diff --git a/tools/gate/roles/airship-run-script/defaults/main.yaml b/tools/gate/roles/airship-run-script/defaults/main.yaml index 725f4b23..7e82fd6b 100644 --- a/tools/gate/roles/airship-run-script/defaults/main.yaml +++ b/tools/gate/roles/airship-run-script/defaults/main.yaml @@ -19,7 +19,7 @@ osh_params: container_distro_version: focal # feature_gates: site: airskiff -HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz +HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7 diff --git a/tools/gate/roles/airship-run-script/tasks/main.yaml b/tools/gate/roles/airship-run-script/tasks/main.yaml index 006106b3..befed4e4 100644 --- a/tools/gate/roles/airship-run-script/tasks/main.yaml +++ b/tools/gate/roles/airship-run-script/tasks/main.yaml @@ -32,7 +32,7 @@ FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}" RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}" PL_SITE: "{{ site | default('airskiff') }}" - HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz') }}" + HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz') }}" HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}" OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}" diff --git a/tools/helm_install.sh b/tools/helm_install.sh index ef54aa15..3ce66c1d 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.14.2-linux-amd64.tar.gz"} function install_helm_binary {