From e0d181c52ba290e2d8fd0e9b268de2983e72ddaf Mon Sep 17 00:00:00 2001 From: Guilherme Santos Date: Wed, 24 Apr 2024 17:42:16 -0300 Subject: [PATCH] Refactor stx-kubernetes-power-manager-helm package name Previous changes enabled the auto-versioning of helm charts to ensure FluxCD helm controller recognizes chart changes. As a result of this refactor, the package name `stx-kubernetes-power-manager-helm` became outdated. This commit updates its name to `stx-kubernetes-power-manager`. It also improves chart versioning based on the Debian environment. Story: 2010929 Task: 49969 Test Plan: PASS: Build all packages generating an application tarball and check whether the charts' versions are correct. PASS: Validate basic application lifecycle operations: upload/apply/remove/delete. Author: Guilherme Santos Change-Id: I82d3ce1ead5a4215268593b4cc9037b3e96074d7 Signed-off-by: Guilherme Santos --- debian_pkg_dirs | 2 +- .../debian/deb_folder/rules | 7 +++---- .../kubernetes-power-manager-helm/files/Makefile | 2 +- .../debian/deb_folder/changelog | 11 ----------- .../debian/deb_folder/changelog | 11 +++++++++++ .../debian/deb_folder/control | 4 ++-- .../debian/deb_folder/copyright | 2 +- .../debian/deb_folder/rules | 2 +- .../debian/deb_folder/source/format | 0 .../deb_folder/stx-kubernetes-power-manager.install | 0 .../debian/meta_data.yaml | 4 ++-- .../stx-kubernetes-power-manager}/README | 0 .../stx-kubernetes-power-manager}/files/metadata.yaml | 0 .../files/workloadPatch.yaml | 0 .../fluxcd-manifests/base/helmrepository.yaml | 0 .../fluxcd-manifests/base/kustomization.yaml | 0 .../kubernetes-power-manager/helmrelease.yaml | 0 .../kubernetes-power-manager-static-overrides.yaml | 0 .../kubernetes-power-manager-system-overrides.yaml | 0 .../kubernetes-power-manager/kustomization.yaml | 0 .../fluxcd-manifests/kustomization.yaml | 0 21 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 stx-kubernetes-power-manager-helm/debian/deb_folder/changelog create mode 100644 stx-kubernetes-power-manager/debian/deb_folder/changelog rename {stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager}/debian/deb_folder/control (85%) rename {stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager}/debian/deb_folder/copyright (97%) rename {stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager}/debian/deb_folder/rules (93%) rename {stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager}/debian/deb_folder/source/format (100%) rename stx-kubernetes-power-manager-helm/debian/deb_folder/stx-kubernetes-power-manager-helm.install => stx-kubernetes-power-manager/debian/deb_folder/stx-kubernetes-power-manager.install (100%) rename {stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager}/debian/meta_data.yaml (75%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/README (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/files/metadata.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/files/workloadPatch.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/base/helmrepository.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/base/kustomization.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/kubernetes-power-manager/helmrelease.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-static-overrides.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-system-overrides.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/kubernetes-power-manager/kustomization.yaml (100%) rename {stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm => stx-kubernetes-power-manager/stx-kubernetes-power-manager}/fluxcd-manifests/kustomization.yaml (100%) diff --git a/debian_pkg_dirs b/debian_pkg_dirs index fc19dce..039ab7e 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,3 +1,3 @@ helm-charts/upstream/kubernetes-power-manager-helm python3-k8sapp-kubernetes-power-manager -stx-kubernetes-power-manager-helm +stx-kubernetes-power-manager diff --git a/helm-charts/upstream/kubernetes-power-manager-helm/debian/deb_folder/rules b/helm-charts/upstream/kubernetes-power-manager-helm/debian/deb_folder/rules index dbbcda8..df5a6cf 100644 --- a/helm-charts/upstream/kubernetes-power-manager-helm/debian/deb_folder/rules +++ b/helm-charts/upstream/kubernetes-power-manager-helm/debian/deb_folder/rules @@ -6,10 +6,9 @@ export APP_FOLDER = $(ROOT)/usr/lib/helm export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.') - -export BASE_CHART_VERSION=v2.4.0 -export BASE_HELM_VERSION=2.4.0 -export CHART_VERSION = $(BASE_CHART_VERSION)+STX.$(PATCH_VERSION) +export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3) +export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION) +export CHART_APP_VERSION=v$(CHART_BASE_VERSION) %: dh $@ diff --git a/helm-charts/upstream/kubernetes-power-manager-helm/kubernetes-power-manager-helm/files/Makefile b/helm-charts/upstream/kubernetes-power-manager-helm/kubernetes-power-manager-helm/files/Makefile index b7d3122..85ce627 100644 --- a/helm-charts/upstream/kubernetes-power-manager-helm/kubernetes-power-manager-helm/files/Makefile +++ b/helm-charts/upstream/kubernetes-power-manager-helm/kubernetes-power-manager-helm/files/Makefile @@ -32,7 +32,7 @@ lint-%: init-% build-%: lint-% if [ -d $* ]; then \ - helm package $(HELM_DIR) --version $(BASE_HELM_VERSION) --app-version $(BASE_CHART_VERSION); \ + helm package $(HELM_DIR) --version $(CHART_BASE_VERSION) --app-version $(CHART_APP_VERSION); \ fi clean: diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/changelog b/stx-kubernetes-power-manager-helm/debian/deb_folder/changelog deleted file mode 100644 index 72e4fd2..0000000 --- a/stx-kubernetes-power-manager-helm/debian/deb_folder/changelog +++ /dev/null @@ -1,11 +0,0 @@ -stx-kubernetes-power-manager-helm (1.1-0) unstable; urgency=medium - - * Initial Release. - - -- Guilherme Santos Mon, 4 Mar 2024 15:55:10 -0300 - -stx-kubernetes-power-manager-helm (1.0-0) unstable; urgency=medium - - * Initial Release. - - -- Thiago Miranda Mon, 1 Aug 2023 08:00:00 +0000 diff --git a/stx-kubernetes-power-manager/debian/deb_folder/changelog b/stx-kubernetes-power-manager/debian/deb_folder/changelog new file mode 100644 index 0000000..30e3dd1 --- /dev/null +++ b/stx-kubernetes-power-manager/debian/deb_folder/changelog @@ -0,0 +1,11 @@ +stx-kubernetes-power-manager (1.1-0) unstable; urgency=medium + + * Renaming package according to the new app structure. + + -- Guilherme Santos Mon, 24 Apr 2024 15:42:10 +0000 + +stx-kubernetes-power-manager-helm (1.0-0) unstable; urgency=medium + + * Initial Release. + + -- Thiago Miranda Mon, 1 Aug 2023 08:00:00 +0000 diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/control b/stx-kubernetes-power-manager/debian/deb_folder/control similarity index 85% rename from stx-kubernetes-power-manager-helm/debian/deb_folder/control rename to stx-kubernetes-power-manager/debian/deb_folder/control index 81dba8e..467ee57 100644 --- a/stx-kubernetes-power-manager-helm/debian/deb_folder/control +++ b/stx-kubernetes-power-manager/debian/deb_folder/control @@ -1,4 +1,4 @@ -Source: stx-kubernetes-power-manager-helm +Source: stx-kubernetes-power-manager Section: libs Priority: optional Maintainer: StarlingX Developers @@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13), Standards-Version: 4.5.1 Homepage: https://www.starlingx.io -Package: stx-kubernetes-power-manager-helm +Package: stx-kubernetes-power-manager Section: libs Architecture: any Depends: ${misc:Depends} diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/copyright b/stx-kubernetes-power-manager/debian/deb_folder/copyright similarity index 97% rename from stx-kubernetes-power-manager-helm/debian/deb_folder/copyright rename to stx-kubernetes-power-manager/debian/deb_folder/copyright index 442411b..c8fa816 100644 --- a/stx-kubernetes-power-manager-helm/debian/deb_folder/copyright +++ b/stx-kubernetes-power-manager/debian/deb_folder/copyright @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: stx-kubernetes-power-manager-helm +Upstream-Name: stx-kubernetes-power-manager Source: https://opendev.org/starlingx/app-kubernetes-power-manager/ Files: * diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/rules b/stx-kubernetes-power-manager/debian/deb_folder/rules similarity index 93% rename from stx-kubernetes-power-manager-helm/debian/deb_folder/rules rename to stx-kubernetes-power-manager/debian/deb_folder/rules index dc20a08..88855d3 100644 --- a/stx-kubernetes-power-manager-helm/debian/deb_folder/rules +++ b/stx-kubernetes-power-manager/debian/deb_folder/rules @@ -31,7 +31,7 @@ override_dh_auto_build: chart_name=$${chart%-*}; \ chart_version=$${chart##*-}; \ echo "Found $$chart; name: $$chart_name, version: $$chart_version"; \ - chart_manifest=$$(find $(STAGING)/fluxcd-manifests -name helmrelease.yaml -exec grep -q $$chart_name {} \; -print); \ + chart_manifest=$$(find $(STAGING)/fluxcd-manifests/$$chart_name -name helmrelease.yaml -exec grep -q $$chart_name {} \; -print); \ echo "Updating manifest: $$chart_manifest"; \ sed -i "s/REPLACE_HELM_CHART_VERSION/$$chart_version/g" $$chart_manifest; \ grep version $$chart_manifest; \ diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/source/format b/stx-kubernetes-power-manager/debian/deb_folder/source/format similarity index 100% rename from stx-kubernetes-power-manager-helm/debian/deb_folder/source/format rename to stx-kubernetes-power-manager/debian/deb_folder/source/format diff --git a/stx-kubernetes-power-manager-helm/debian/deb_folder/stx-kubernetes-power-manager-helm.install b/stx-kubernetes-power-manager/debian/deb_folder/stx-kubernetes-power-manager.install similarity index 100% rename from stx-kubernetes-power-manager-helm/debian/deb_folder/stx-kubernetes-power-manager-helm.install rename to stx-kubernetes-power-manager/debian/deb_folder/stx-kubernetes-power-manager.install diff --git a/stx-kubernetes-power-manager-helm/debian/meta_data.yaml b/stx-kubernetes-power-manager/debian/meta_data.yaml similarity index 75% rename from stx-kubernetes-power-manager-helm/debian/meta_data.yaml rename to stx-kubernetes-power-manager/debian/meta_data.yaml index 1e5661b..4bca7be 100644 --- a/stx-kubernetes-power-manager-helm/debian/meta_data.yaml +++ b/stx-kubernetes-power-manager/debian/meta_data.yaml @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 # --- -debname: stx-kubernetes-power-manager-helm +debname: stx-kubernetes-power-manager debver: 1.1-0 -src_path: stx-kubernetes-power-manager-helm +src_path: stx-kubernetes-power-manager revision: dist: $STX_DIST GITREVCOUNT: diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/README b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/README similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/README rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/README diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/files/metadata.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/files/metadata.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/files/metadata.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/files/metadata.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/files/workloadPatch.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/files/workloadPatch.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/files/workloadPatch.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/files/workloadPatch.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/base/helmrepository.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/base/helmrepository.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/base/helmrepository.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/base/helmrepository.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/base/kustomization.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/base/kustomization.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/base/kustomization.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/base/kustomization.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/helmrelease.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/helmrelease.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/helmrelease.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/helmrelease.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-static-overrides.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-static-overrides.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-static-overrides.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-static-overrides.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-system-overrides.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-system-overrides.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-system-overrides.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kubernetes-power-manager-system-overrides.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kustomization.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kustomization.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kubernetes-power-manager/kustomization.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kubernetes-power-manager/kustomization.yaml diff --git a/stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kustomization.yaml b/stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kustomization.yaml similarity index 100% rename from stx-kubernetes-power-manager-helm/stx-kubernetes-power-manager-helm/fluxcd-manifests/kustomization.yaml rename to stx-kubernetes-power-manager/stx-kubernetes-power-manager/fluxcd-manifests/kustomization.yaml