From 9a52eba73c81440db6c51208b247a2843602207f Mon Sep 17 00:00:00 2001 From: Igor Soares Date: Thu, 23 Mar 2023 19:26:24 -0400 Subject: [PATCH] Upversion Helm to v3.9.4 Bump Helm version from 3.2.1 to 3.9.4. This also bumps helm-mapkubeapis from 0.3.0 to 0.3.2 which is the version built against Helm SDK 3.9.4. In addition, this removes the helm-2to3 plugin since we fully moved to helm v3. Changelogs: Helm 3.9.4: https://github.com/helm/helm/releases/tag/v3.9.4 helm-mapkubeapis 0.3.2: https://github.com/helm/helm-mapkubeapis/releases/tag/v0.3.2 Test plan: PASS: build-pkgs --clean --all PASS: full AIO-SX deployment PASS: nginx-ingress-controller successfully uploaded/applied PASS: cert-manager successfully uploaded/applied PASS: platform-integ-apps successfully uploaded/applied PASS: oidc-auth-apps successfully uploaded/applied PASS: app-istio successfully uploaded/applied/removed/deleted PASS: app-kubevirt successfully uploaded/applied/removed/deleted PASS: app-oran-o2 successfully uploaded/applied/removed/deleted PASS: app-security-profiles-operator successfully uploaded/applied/removed/deleted PASS: app-sriov-fec-operator successfully uploaded/applied/removed/deleted PASS: app-sts-silicom successfully uploaded/applied/removed/deleted PASS: audit-armada-app successfully uploaded/applied/removed/deleted PASS: metrics-server-armada-app successfully uploaded/applied/removed/deleted PASS: ptp-notification-armada-app successfully uploaded/applied/removed/deleted PASS: snmp-armada-app successfully uploaded/applied/removed/deleted PASS: vault-armada-app successfully uploaded/applied/removed/deleted Story: 2010677 Task: 47757 Depends-On: https://review.opendev.org/c/starlingx/config/+/878727 Change-Id: I6a2fd93a9e41a89d100ab295e55aa3e0cb0847fe Signed-off-by: Igor Soares --- kubernetes/helm/debian/deb_folder/changelog | 6 ++++++ .../helm/debian/deb_folder/helm.install | 1 - kubernetes/helm/debian/deb_folder/rules | 11 ++-------- kubernetes/helm/debian/meta_data.yaml | 21 +++++++------------ 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/kubernetes/helm/debian/deb_folder/changelog b/kubernetes/helm/debian/deb_folder/changelog index 8b0102f1d..d90575270 100644 --- a/kubernetes/helm/debian/deb_folder/changelog +++ b/kubernetes/helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +helm (3.9.4-1) unstable; urgency=medium + + * Bump version (3.9.4) + + -- Igor Soares Mon, 27 Mar 2023 17:22:00 +0000 + helm (3.2.1-1) unstable; urgency=medium * Initial release diff --git a/kubernetes/helm/debian/deb_folder/helm.install b/kubernetes/helm/debian/deb_folder/helm.install index 239830529..37b0a4bc2 100644 --- a/kubernetes/helm/debian/deb_folder/helm.install +++ b/kubernetes/helm/debian/deb_folder/helm.install @@ -4,5 +4,4 @@ usr/local/sbin/helm-upload usr/local/sbin/helmv2-cli usr/local/share/helm usr/local/share/helm/plugins -usr/local/share/helm/plugins/2to3 usr/local/share/helm/plugins/mapkubeapis diff --git a/kubernetes/helm/debian/deb_folder/rules b/kubernetes/helm/debian/deb_folder/rules index 82ecfdc2a..2aea5bd43 100755 --- a/kubernetes/helm/debian/deb_folder/rules +++ b/kubernetes/helm/debian/deb_folder/rules @@ -6,14 +6,11 @@ export ROOT = debian/tmp export SBINDIR = $(ROOT)/usr/sbin export SUDOERDIR = $(ROOT)/etc/sudoers.d -export HELM_VERSION = 3.2.1 +export HELM_VERSION = 3.9.4 export HELM_EXECUTABLE = linux-amd64/helm export HELM_PKG = helm-v$(HELM_VERSION)-linux-amd64.tar.gz -export HELM_2TO3_VERSION = 0.10.0 -export HELM_2TO3_PKG = helm-2to3_$(HELM_2TO3_VERSION).tar.gz - -export HELM_MAPKUBEAPIS_VERSION = 0.3.0 +export HELM_MAPKUBEAPIS_VERSION = 0.3.2 export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION).tar.gz %: @@ -22,7 +19,6 @@ export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION).tar.g override_dh_auto_build: # Extract the third party helm package downloaded in dl_hook. tar xfz $(HELM_PKG) - tar xfz $(HELM_2TO3_PKG) tar xfz $(HELM_MAPKUBEAPIS_PKG) override_dh_auto_install: @@ -35,9 +31,6 @@ override_dh_auto_install: install -p -D -m 440 helm.sudo $(SUDOERDIR)/helm install -d -m 755 $(ROOT)/usr/local/share/helm install -d -m 755 $(ROOT)/usr/local/share/helm/plugins - cp -R 2to3 $(ROOT)/usr/local/share/helm/plugins/ - install -d -m 755 $(ROOT)/usr/local/share/helm/plugins/2to3/bin - mv $(ROOT)/usr/local/share/helm/plugins/2to3/2to3 $(ROOT)/usr/local/share/helm/plugins/2to3/bin cp -R mapkubeapis $(ROOT)/usr/local/share/helm/plugins/ override_dh_usrlocal: diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml index 6c6d82f87..4674680f8 100644 --- a/kubernetes/helm/debian/meta_data.yaml +++ b/kubernetes/helm/debian/meta_data.yaml @@ -1,23 +1,16 @@ --- debname: helm -debver: 3.2.1-1 +debver: 3.9.4-1 src_path: centos/files dl_files: - helm-v3.2.1-linux-amd64.tar.gz: + helm-v3.9.4-linux-amd64.tar.gz: topdir: linux-amd64 - url: https://get.helm.sh/helm-v3.2.1-linux-amd64.tar.gz - md5sum: 98764c2c0175bd306223cc985700d619 - sha256sum: 018f9908cb950701a5d59e757653a790c66d8eda288625dbb185354ca6f41f6b - helm-mapkubeapis_0.3.0.tar.gz: + url: https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz + sha256sum: 31960ff2f76a7379d9bac526ddf889fb79241191f1dbe2a24f7864ddcb3f6560 + helm-mapkubeapis_0.3.2.tar.gz: topdir: mapkubeapis - url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.3.0/helm-mapkubeapis_0.3.0_linux_amd64.tar.gz - md5sum: 6559501f4658af4e92e65eae0782daae - sha256sum: 2a3aa264b7ed2d7055528e9ae1ebc6ff253f4be6f1a899d32a05b8ca342a8d8c - helm-2to3_0.10.0.tar.gz: - topdir: 2to3 - url: https://github.com/helm/helm-2to3/releases/download/v0.10.0/helm-2to3_0.10.0_linux_amd64.tar.gz - md5sum: 64af061b463df1657e5e842df6adfbbf - sha256sum: 0d0f5312fef60357c8363b5dbc2995375945abb7a3c53cb3bf59dfda35ef50d3 + url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.3.2/helm-mapkubeapis_0.3.2_linux_amd64.tar.gz + sha256sum: fdc017a5e95921967b670114723437f2d757c718f8324832b3d4bd7787f17e98 revision: dist: $STX_DIST