From dc35de7b881a5acda5fa5be025f27d278721b74b Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 24 Jan 2022 13:11:26 +0000 Subject: [PATCH] debian: Correct helm-upload path helm-upload was located on /usr/sbin while the puppet module was expecting it to be located in /usr/local/sbin. Put it in the place where the puppet module was expecting it. Test Plan: Pass Build helm with correct paths. Pass Check to see if helm-upload is located in /usr/local/sbin. Story: 2009101 Task: 43715 Signed-off-by: Charles Short Change-Id: I0dc22b4e5888cbfd26728588d0c09a5a47bd3305 --- kubernetes/helm/debian/deb_folder/helm.install | 4 ++-- kubernetes/helm/debian/deb_folder/rules | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm/debian/deb_folder/helm.install b/kubernetes/helm/debian/deb_folder/helm.install index 862f7638f..39a38996d 100644 --- a/kubernetes/helm/debian/deb_folder/helm.install +++ b/kubernetes/helm/debian/deb_folder/helm.install @@ -1,4 +1,4 @@ etc/sudoers.d/helm usr/sbin/helm -usr/sbin/helm-upload -usr/sbin/helmv2-cli +usr/local/sbin/helm-upload +usr/local/sbin/helmv2-cli diff --git a/kubernetes/helm/debian/deb_folder/rules b/kubernetes/helm/debian/deb_folder/rules index 6dec58ad1..8b1e641f3 100755 --- a/kubernetes/helm/debian/deb_folder/rules +++ b/kubernetes/helm/debian/deb_folder/rules @@ -18,8 +18,12 @@ override_dh_auto_build: override_dh_auto_install: install -d -m 755 $(SBINDIR) + install -d -m 755 $(ROOT)/usr/local/sbin install -p -D -m 755 $(HELM_EXECUTABLE) $(SBINDIR) - install -p -D -m 755 helm-upload $(SBINDIR) - install -p -D -m 755 helmv2-cli.sh $(SBINDIR)/helmv2-cli + install -p -D -m 755 helm-upload $(ROOT)/usr/local/sbin + install -p -D -m 755 helmv2-cli.sh $(ROOT)/usr/local/sbin/helmv2-cli install -d -m 755 $(SUDOERDIR) install -p -D -m 440 helm.sudo $(SUDOERDIR)/helm + +override_dh_usrlocal: + # Do Nothing