From 05afa6b47ccb6021bf083abefb882de0e84f3670 Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Tue, 23 Aug 2022 18:34:09 -0300 Subject: [PATCH] Remove mertrics-server armada app build As part of Armada deprecation we need to remove all Armada application builds for all applications that have been migrated to FluxCD. This patch removes the armada app build from centos and debian. TEST PLAN: PASS: Build centos PASS: Build debian PASS: deb package does not have armada tarball PASS: rpm package does not have armada tarball PASS: FluxCD tarball is unchanged Story: 2009138 Task: 46098 Signed-off-by: Lucas Cavalcante Change-Id: If10f095c4a4a1d1a59b8c4504515495515e6655c --- centos_iso_image.inc | 1 - .../centos/stx-metrics-server-helm.spec | 25 +---- .../debian/deb_folder/control | 4 +- .../debian/deb_folder/rules | 26 ------ .../manifests/metrics-server_manifest.yaml | 92 ------------------- 5 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 stx-metrics-server-helm/stx-metrics-server-helm/manifests/metrics-server_manifest.yaml diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 1623486..e8b265a 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -1,3 +1,2 @@ stx-metrics-server-helm -stx-metrics-server-helm-armada diff --git a/stx-metrics-server-helm/centos/stx-metrics-server-helm.spec b/stx-metrics-server-helm/centos/stx-metrics-server-helm.spec index bba5285..b6b0beb 100644 --- a/stx-metrics-server-helm/centos/stx-metrics-server-helm.spec +++ b/stx-metrics-server-helm/centos/stx-metrics-server-helm.spec @@ -2,10 +2,9 @@ %global app_name metrics-server %global helm_repo stx-platform %global helm_folder /usr/lib/helm -%global armada_folder /usr/lib/armada %global app_folder /usr/local/share/applications/helm -Summary: StarlingX Metrics Server Armada Helm Charts +Summary: StarlingX Metrics Server FluxCD Helm Charts Name: stx-metrics-server-helm Version: 1.0 Release: %{tis_patch_ver}%{?_tis_dist} @@ -25,14 +24,6 @@ BuildRequires: metrics-server-helm %description StarlingX Metrics Server FluxCD Helm Charts -%package armada -Summary: StarlingX Metrics Server Controller Application Armada Helm Charts -Group: base -License: Apache-2.0 - -%description armada -StarlingX Metrics Server Controller Application Armada Helm Charts - %prep %setup @@ -52,29 +43,21 @@ kill %1 # Create a chart tarball compliant with sysinv kube-app.py %define app_staging %{_builddir}/staging -%define app_tarball_armada %{app_name}-armada-%{version}-%{tis_patch_ver}.tgz %define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz # Setup staging mkdir -p %{app_staging} cp files/metadata.yaml %{app_staging} -cp manifests/*.yaml %{app_staging} mkdir -p %{app_staging}/charts cp helm-charts/*.tgz %{app_staging}/charts cp %{helm_folder}/metrics*.tgz %{app_staging}/charts -cd %{app_staging} # Populate metadata sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml -# package armada -find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 -tar -zcf %{_builddir}/%{app_tarball_armada} -C %{app_staging}/ . - #package fluxcd -cd %{_builddir}/%{name}-%{version} cp -Rv fluxcd-manifests %{app_staging}/ find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 @@ -85,14 +68,8 @@ rm -fr %{app_staging} %install install -d -m 755 %{buildroot}/%{app_folder} -install -p -D -m 755 %{_builddir}/%{app_tarball_armada} %{buildroot}/%{app_folder} install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder} -%files armada -%defattr(-,root,root,-) -%{app_folder}/%{app_tarball_armada} - - %files %defattr(-,root,root,-) %{app_folder}/%{app_tarball_fluxcd} diff --git a/stx-metrics-server-helm/debian/deb_folder/control b/stx-metrics-server-helm/debian/deb_folder/control index db23ae2..9cfca9c 100644 --- a/stx-metrics-server-helm/debian/deb_folder/control +++ b/stx-metrics-server-helm/debian/deb_folder/control @@ -14,6 +14,6 @@ Package: stx-metrics-server-helm Section: libs Architecture: any Depends: ${misc:Depends} -Description: StarlingX Metrics Server Armada Helm Charts - This package contains Armada helm charts for the metrics server +Description: StarlingX Metrics Server FluxCD Helm Charts + This package contains FluxCD helm charts for the metrics server application. diff --git a/stx-metrics-server-helm/debian/deb_folder/rules b/stx-metrics-server-helm/debian/deb_folder/rules index fea1767..22bae4e 100644 --- a/stx-metrics-server-helm/debian/deb_folder/rules +++ b/stx-metrics-server-helm/debian/deb_folder/rules @@ -10,10 +10,8 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.') export APP_NAME = metrics-server export APP_VERSION = $(MAJOR).$(MINOR_PATCH) -export APP_TARBALL_ARMADA = $(APP_NAME)-armada-$(APP_VERSION).tgz 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 @@ -34,29 +32,6 @@ override_dh_auto_build: # Terminate the helm chart server. pkill chartmuseum - ############ - # ARMADA # - ############ - # Setup the staging directory. - mkdir -p $(STAGING_ARMADA) - cp files/metadata.yaml $(STAGING_ARMADA) - 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 - sed -i 's/@APP_VERSION@/$(APP_VERSION)/g' $(STAGING_ARMADA)/metadata.yaml - sed -i 's/@HELM_REPO@/$(HELM_REPO)/g' $(STAGING_ARMADA)/metadata.yaml - - # Create the app package. - cd $(STAGING_ARMADA) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 - tar cfz $(APP_TARBALL_ARMADA) -C $(STAGING_ARMADA)/ . - - # Cleanup staging - rm -rf $(STAGING_ARMADA) - ############ # FLUXCD # ############ @@ -86,7 +61,6 @@ override_dh_auto_build: override_dh_auto_install: # Install the app tar file. install -d -m 755 $(APP_FOLDER) - install -p -D -m 755 $(APP_TARBALL_ARMADA) $(APP_FOLDER) install -p -D -m 755 $(APP_TARBALL_FLUXCD) $(APP_FOLDER) override_dh_auto_test: diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/manifests/metrics-server_manifest.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/manifests/metrics-server_manifest.yaml deleted file mode 100644 index 9c1dc58..0000000 --- a/stx-metrics-server-helm/stx-metrics-server-helm/manifests/metrics-server_manifest.yaml +++ /dev/null @@ -1,92 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: metrics-server-psp-rolebinding -data: - chart_name: psp-rolebinding - release: metrics-server-psp-rolebinding - namespace: metrics-server - values: - rolebindingNamespace: metrics-server - serviceAccount: metrics-server - source: - location: http://172.17.0.1:8080/helm_charts/stx-platform/psp-rolebinding-0.1.0.tgz - subpath: psp-rolebinding - type: tar - reference: master - upgrade: - no_hooks: false - pre: - delete: - - labels: - release_group: metrics-server-psp-rolebinding - type: job - wait: - labels: - release_group: metrics-server-psp-rolebinding - resources: [] - timeout: 1800 - dependencies: [] ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: metrics-server -data: - chart_name: metrics-server - release: metrics-server - namespace: metrics-server - wait: - timeout: 1800 - labels: - app: metrics-server - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app: metrics-server - values: - imagePullSecrets: [{"name": "default-registry-key"}] - args: - - --kubelet-insecure-tls - replicas: 1 - image: - repository: k8s.gcr.io/metrics-server/metrics-server - tag: "v0.6.1" - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - nodeSelector: - node-role.kubernetes.io/master: "" - source: - type: tar - location: http://172.17.0.1/helm_charts/stx-platform/metrics-server-3.8.2.tgz - subpath: metrics-server - reference: master - dependencies: [] ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: metrics-server -data: - description: "StarlingX metrics-server" - sequenced: true - chart_group: - - metrics-server-psp-rolebinding - - metrics-server ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: metrics-server-manifest -data: - release_prefix: ms - chart_groups: - - metrics-server