From e24e2005d570c108953c3224e7434b20f5549b54 Mon Sep 17 00:00:00 2001 From: David Bastos Date: Fri, 31 May 2024 09:36:13 -0300 Subject: [PATCH] Remove MAKEKUBEAPI package Mapkubeapis is a Helm v3 plugin which updates in-place Helm release metadata that contains deprecated or removed Kubernetes APIs to a new instance with supported Kubernetes APIs, or entirely removes references to resources that use APIs that were removed and do not have a successor. It was needed when helmv2 was migrated to helmv3, but is now no longer used. Test plan: PASS: build-pkgs -c -p helm PASS: build-pkgs --clean --all PASS: Build new image PASS: full AIO-SX deployment PASS: No references to the mapkubeapis plugin were found anymore PASS: Upload, apply, remove and delete nginx-ingress-controller PASS: Upload, apply, remove and delete platform-integ-apps PASS: Upload, apply, remove and delete metrics-server Story: 2011129 Task: 50214 Change-Id: I23a970a2c17b35ebe8c8aa915c8cd0246c598d5c Signed-off-by: David Bastos --- kubernetes/helm/debian/deb_folder/helm.install | 2 -- kubernetes/helm/debian/deb_folder/rules | 8 -------- kubernetes/helm/debian/meta_data.yaml | 4 ---- 3 files changed, 14 deletions(-) diff --git a/kubernetes/helm/debian/deb_folder/helm.install b/kubernetes/helm/debian/deb_folder/helm.install index e1a2dc6bd..b9d76f995 100644 --- a/kubernetes/helm/debian/deb_folder/helm.install +++ b/kubernetes/helm/debian/deb_folder/helm.install @@ -2,5 +2,3 @@ etc/sudoers.d/helm usr/sbin/helm usr/local/sbin/helm-upload usr/local/share/helm -usr/local/share/helm/plugins -usr/local/share/helm/plugins/mapkubeapis diff --git a/kubernetes/helm/debian/deb_folder/rules b/kubernetes/helm/debian/deb_folder/rules index 838aa77d9..74e9f7e0e 100755 --- a/kubernetes/helm/debian/deb_folder/rules +++ b/kubernetes/helm/debian/deb_folder/rules @@ -10,16 +10,12 @@ export HELM_VERSION = 3.14.4 export HELM_EXECUTABLE = linux-amd64/helm export HELM_PKG = helm-v$(HELM_VERSION)-linux-amd64.tar.gz -export HELM_MAPKUBEAPIS_VERSION = 0.4.1 -export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION)_linux_amd64.tar.gz - %: dh $@ override_dh_auto_build: # Extract the third party helm package downloaded in dl_hook. tar xfz $(HELM_PKG) - tar xfz $(HELM_MAPKUBEAPIS_PKG) override_dh_auto_install: install -d -m 755 $(SBINDIR) @@ -29,10 +25,6 @@ override_dh_auto_install: install -d -m 755 $(SUDOERDIR) 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 mapkubeapis $(ROOT)/usr/local/share/helm/plugins/ - install -d -m 755 $(ROOT)/usr/local/share/helm/plugins/mapkubeapis/bin - mv $(ROOT)/usr/local/share/helm/plugins/mapkubeapis/mapkubeapis $(ROOT)/usr/local/share/helm/plugins/mapkubeapis/bin/ override_dh_usrlocal: # Do Nothing diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml index ec305fdf3..e4f7687e1 100644 --- a/kubernetes/helm/debian/meta_data.yaml +++ b/kubernetes/helm/debian/meta_data.yaml @@ -7,10 +7,6 @@ dl_files: topdir: linux-amd64 url: https://get.helm.sh/helm-v3.14.4-linux-amd64.tar.gz sha256sum: a5844ef2c38ef6ddf3b5a8f7d91e7e0e8ebc39a38bb3fc8013d629c1ef29c259 - helm-mapkubeapis_0.4.1_linux_amd64.tar.gz: - topdir: mapkubeapis - url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.4.1/helm-mapkubeapis_0.4.1_linux_amd64.tar.gz - sha256sum: e90a22c4acee76774589042f6a5901e136ee33c10630790d6cff37d169905a78 revision: dist: $STX_DIST