From 6b839fdc2830b633f3b4d6f13f9068e2606fcba5 Mon Sep 17 00:00:00 2001 From: Luiz Felipe Kina Date: Thu, 23 Jun 2022 00:32:38 -0400 Subject: [PATCH] Fixing metrics-server on Centos and Debian A previous patch had wrong values to download images. Fixed the patch. Metrics-server-helm on debian wasn't working, it was fixed and metrics-server-helm was added as a dependency for stx-metrics-server-helm. TEST PLAN CENTOS: PASS Build-pkgs centos PASS Build-iso centos PASS Apply application centos PASS Remove application centos TEST PLAN DEBIAN: PASS Build-pkgs debian PASS Build-iso debian PASS Apply application debian PASS Remove application debian Closes-bug: 1979586 Signed-off-by: Luiz Felipe Kina Signed-off-by: Felipe Sanches Zanoni Change-Id: I988a5032d7d3fc8769ed6c502d37cfc3493ea282 --- .../centos/metrics-server-helm.spec | 2 +- .../debian/deb_folder/changelog | 2 +- .../deb_folder/metrics-server-helm.install | 1 + metrics-server-helm/debian/deb_folder/rules | 18 ++++++++++++++---- ...001-Add-sample-app-to-metrics-server.patch} | 15 ++++++++------- .../debian/deb_folder/control | 3 ++- .../debian/deb_folder/rules | 3 +++ 7 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 metrics-server-helm/debian/deb_folder/metrics-server-helm.install rename metrics-server-helm/files/{0001-PATCH-Add-sample-app-to-metrics-server.patch => 0001-Add-sample-app-to-metrics-server.patch} (92%) diff --git a/metrics-server-helm/centos/metrics-server-helm.spec b/metrics-server-helm/centos/metrics-server-helm.spec index 213a010..5404555 100644 --- a/metrics-server-helm/centos/metrics-server-helm.spec +++ b/metrics-server-helm/centos/metrics-server-helm.spec @@ -19,7 +19,7 @@ Source3: Makefile BuildArch: noarch -Patch01: 0001-PATCH-Add-sample-app-to-metrics-server.patch +Patch01: 0001-Add-sample-app-to-metrics-server.patch BuildRequires: helm BuildRequires: chartmuseum diff --git a/metrics-server-helm/debian/deb_folder/changelog b/metrics-server-helm/debian/deb_folder/changelog index b11d2ff..2a553a1 100644 --- a/metrics-server-helm/debian/deb_folder/changelog +++ b/metrics-server-helm/debian/deb_folder/changelog @@ -2,4 +2,4 @@ metrics-server-helm (1.0) unstable; urgency=medium * Initial release. --- Luiz Felipe Kina Thu, 24 Mar 2022 17:50: +0000 + -- Luiz Felipe Kina Thu, 24 Mar 2022 17:50: +0000 diff --git a/metrics-server-helm/debian/deb_folder/metrics-server-helm.install b/metrics-server-helm/debian/deb_folder/metrics-server-helm.install new file mode 100644 index 0000000..8a0c6de --- /dev/null +++ b/metrics-server-helm/debian/deb_folder/metrics-server-helm.install @@ -0,0 +1 @@ +usr/lib/helm/* diff --git a/metrics-server-helm/debian/deb_folder/rules b/metrics-server-helm/debian/deb_folder/rules index d1d7919..4eca399 100644 --- a/metrics-server-helm/debian/deb_folder/rules +++ b/metrics-server-helm/debian/deb_folder/rules @@ -1,25 +1,35 @@ #!/usr/bin/make -f # export DH_VERBOSE = 1 -export ROOT = debian/tmp export METRICS_MGR_PKG="metrics-server-3.8.2.tgz" +export HELM_FOLDER=/usr/lib/helm +export ROOT=debian/tmp +export APP_FOLDER=$(ROOT)$(HELM_FOLDER) %: dh $@ override_dh_auto_build: + # Unpack metrics-server source tar xzf $(METRICS_MGR_PKG) + + # Apply patch to code + cd metrics-server && patch -p1 < ../0001-Add-sample-app-to-metrics-server.patch + # Host a server for the helm charts. chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" \ --storage-local-rootdir="." & + sleep 2 - # Copy Chart yaml file to build folder - cp metrics-server/Chart.yaml debian/Chart.yaml + # Create the TGZ file. - make + make metrics-server + # Terminate the helm chart server. pkill chartmuseum override_dh_auto_install: + install -d -m 755 $(APP_FOLDER) + install -p -D -m 755 *.tgz $(APP_FOLDER) override_dh_auto_test: diff --git a/metrics-server-helm/files/0001-PATCH-Add-sample-app-to-metrics-server.patch b/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch similarity index 92% rename from metrics-server-helm/files/0001-PATCH-Add-sample-app-to-metrics-server.patch rename to metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch index 1373f5c..819706a 100644 --- a/metrics-server-helm/files/0001-PATCH-Add-sample-app-to-metrics-server.patch +++ b/metrics-server-helm/files/0001-Add-sample-app-to-metrics-server.patch @@ -1,8 +1,9 @@ -From 2df39de8e32eccc76fe62b97eaf0bc5debc58023 Mon Sep 17 00:00:00 2001 -From: Delfino Curado -Date: Thu, 3 Mar 2022 10:36:48 -0300 -Subject: [PATCH] [PATCH] Add sample app to metrics-server +From eb8e6805914d912be374eb86731a88c3936b91b8 Mon Sep 17 00:00:00 2001 +From: Luiz Felipe Kina +Date: Wed, 22 Jun 2022 22:08:25 -0400 +Subject: [PATCH] Add sample app to metrics-server +Signed-off-by: Luiz Felipe Kina --- templates/sample-app-cluster-role-binding.yml | 16 ++++++++++++ templates/sample-app-cluster-role.yml | 17 +++++++++++++ @@ -124,7 +125,7 @@ index 0000000..5e116c0 +{{- end }} \ No newline at end of file diff --git a/values.yaml b/values.yaml -index 6a97505..7f40309 100644 +index 6a97505..5167d25 100644 --- a/values.yaml +++ b/values.yaml @@ -128,3 +128,12 @@ nodeSelector: {} @@ -138,8 +139,8 @@ index 6a97505..7f40309 100644 + create: false + image: + repository: docker.io/starlingx/stx-metrics-server-sample-app -+ tag: master-centos-stable-latest ++ tag: stx.7.0-v1.0.0 + -- -2.17.1 +2.29.2 diff --git a/stx-metrics-server-helm/debian/deb_folder/control b/stx-metrics-server-helm/debian/deb_folder/control index da28a8d..db23ae2 100644 --- a/stx-metrics-server-helm/debian/deb_folder/control +++ b/stx-metrics-server-helm/debian/deb_folder/control @@ -5,7 +5,8 @@ Maintainer: StarlingX Developers Build-Depends: debhelper-compat (= 13), chartmuseum, helm, - procps + procps, + metrics-server-helm Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/stx-metrics-server-helm/debian/deb_folder/rules b/stx-metrics-server-helm/debian/deb_folder/rules index 9596501..fea1767 100644 --- a/stx-metrics-server-helm/debian/deb_folder/rules +++ b/stx-metrics-server-helm/debian/deb_folder/rules @@ -15,6 +15,7 @@ export APP_TARBALL_FLUXCD = $(APP_NAME)-$(APP_VERSION).tgz export HELM_REPO = stx-platform export STAGING_ARMADA = staging-armada export STAGING_FLUXCD = staging-fluxcd +export HELM_FOLDER = /usr/lib/helm %: dh $@ @@ -42,6 +43,7 @@ override_dh_auto_build: cp manifests/metrics-server_manifest.yaml $(STAGING_ARMADA) mkdir -p $(STAGING_ARMADA)/charts cp helm-charts/*.tgz $(STAGING_ARMADA)/charts + cp $(HELM_FOLDER)/metrics*.tgz $(STAGING_ARMADA)/charts # Populate metadata. sed -i 's/@APP_NAME@/$(APP_NAME)/g' $(STAGING_ARMADA)/metadata.yaml @@ -64,6 +66,7 @@ override_dh_auto_build: cp -Rv fluxcd-manifests $(STAGING_FLUXCD) mkdir -p $(STAGING_FLUXCD)/charts cp helm-charts/*.tgz $(STAGING_FLUXCD)/charts + cp $(HELM_FOLDER)/metrics*.tgz $(STAGING_FLUXCD)/charts # Populate metadata. sed -i 's/@APP_NAME@/$(APP_NAME)/g' $(STAGING_FLUXCD)/metadata.yaml