From 4fac26a7f508d1ee63355855e55ed8d0c13b27b5 Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Fri, 19 Aug 2022 10:45:04 -0300 Subject: [PATCH] Remove platform-integ-app armada application 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: rpm package has no armada tarball PASS: deb package has no armada tarball PASS: fluxcd tarball is unchanged Story: 2009138 Task: 46046 Signed-off-by: Lucas Cavalcante Change-Id: Ic1d31c3aba2e6c43c436f679f0a3f4c8479757a5 --- centos_iso_image.inc | 1 - .../centos/stx-platform-helm.spec | 31 +--- stx-platform-helm/debian/deb_folder/control | 4 +- stx-platform-helm/debian/deb_folder/rules | 29 ---- .../stx-platform-helm/manifests/manifest.yaml | 141 ------------------ 5 files changed, 3 insertions(+), 203 deletions(-) delete mode 100644 stx-platform-helm/stx-platform-helm/manifests/manifest.yaml diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 8a6af0c..39eea7c 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -1,3 +1,2 @@ stx-platform-helm -stx-platform-helm-armada diff --git a/stx-platform-helm/centos/stx-platform-helm.spec b/stx-platform-helm/centos/stx-platform-helm.spec index 815ca01..41f0b6d 100644 --- a/stx-platform-helm/centos/stx-platform-helm.spec +++ b/stx-platform-helm/centos/stx-platform-helm.spec @@ -31,14 +31,6 @@ BuildRequires: python-k8sapp-platform-wheels %description The StarlingX K8S FluxCD application for platform integration -%package armada -Summary: The StarlingX K8S Armada application for platform integration -Group: base -License: Apache-2.0 - -%description armada -The StarlingX K8S Armada application for platform integration - %prep %setup @@ -65,18 +57,14 @@ 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 -%define armada_app_path %{_builddir}/%{app_tarball_armada} %define fluxcd_app_path %{_builddir}/%{app_tarball_fluxcd} # Setup staging mkdir -p %{app_staging} cp files/metadata.yaml %{app_staging} -cp manifests/manifest.yaml %{app_staging} mkdir -p %{app_staging}/charts cp helm-charts/*.tgz %{app_staging}/charts -cd %{app_staging} # Populate metadata sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml @@ -87,18 +75,6 @@ sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml mkdir -p %{app_staging}/plugins cp /plugins/%{app_name}/*.whl %{app_staging}/plugins -# calculate checksum -find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 - -# package armada app -tar -zcf %armada_app_path -C %{app_staging}/ . - -# switch back to source root -cd - - -# Prepare app_staging for fluxcd package -rm -f %{app_staging}/manifest.yaml - cp -R fluxcd-manifests %{app_staging}/ # calculate checksum of all files in app_staging @@ -115,17 +91,12 @@ rm -fr %{app_staging} %install install -d -m 755 %{buildroot}/%{app_folder} -install -p -D -m 755 %armada_app_path %{buildroot}/%{app_folder} install -p -D -m 755 %fluxcd_app_path %{buildroot}/%{app_folder} install -d -m 755 ${RPM_BUILD_ROOT}/opt/extracharts # TODO (rchurch): remove install -p -D -m 755 helm-charts/node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts -%files armada -%defattr(-,root,root,-) -%{app_folder}/%{app_tarball_armada} -/opt/extracharts/* - %files %defattr(-,root,root,-) +/opt/extracharts/* %{app_folder}/%{app_tarball_fluxcd} diff --git a/stx-platform-helm/debian/deb_folder/control b/stx-platform-helm/debian/deb_folder/control index 9371c1f..0ba4d41 100644 --- a/stx-platform-helm/debian/deb_folder/control +++ b/stx-platform-helm/debian/deb_folder/control @@ -16,6 +16,6 @@ Package: stx-platform-helm Section: libs Architecture: any Depends: ${misc:Depends} -Description: StarlingX Platform Armada Helm Charts - This package contains Armada helm charts for the platform armada +Description: StarlingX Platform FluxCD Helm Charts + This package contains FluxCD helm charts for the platform armada application. diff --git a/stx-platform-helm/debian/deb_folder/rules b/stx-platform-helm/debian/deb_folder/rules index b41ca7b..1ccad89 100755 --- a/stx-platform-helm/debian/deb_folder/rules +++ b/stx-platform-helm/debian/deb_folder/rules @@ -11,11 +11,9 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.') export APP_NAME = platform-integ-apps 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_FOLDER = /usr/lib/helm export HELM_REPO = stx-platform -export STAGING_ARMADA = staging-armada export STAGING_FLUXCD = staging-fluxcd export TOOLKIT_VERSION = 0.2.19 @@ -45,32 +43,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/manifest.yaml $(STAGING_ARMADA) - mkdir -p $(STAGING_ARMADA)/charts - cp helm-charts/*.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 - - # Copy the plugins: installed in the buildroot - mkdir -p $(STAGING_ARMADA)/plugins - cp /plugins/$(APP_NAME)/*.whl $(STAGING_ARMADA)/plugins - - # 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 # ############ @@ -100,7 +72,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) install -d -m 755 $(EXTRA_CHARTS) install -p -D -m 755 helm-charts/node-feature-discovery-*.tgz $(EXTRA_CHARTS) diff --git a/stx-platform-helm/stx-platform-helm/manifests/manifest.yaml b/stx-platform-helm/stx-platform-helm/manifests/manifest.yaml deleted file mode 100644 index 6a1f822..0000000 --- a/stx-platform-helm/stx-platform-helm/manifests/manifest.yaml +++ /dev/null @@ -1,141 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: helm-toolkit -data: - chart_name: helm-toolkit - release: helm-toolkit - namespace: helm-toolkit - values: {} - source: - type: tar - location: http://172.17.0.1:8080/helm_charts/stx-platform/helm-toolkit-0.2.19.tgz - subpath: helm-toolkit - reference: master - dependencies: [] ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kube-system-rbd-provisioner -data: - chart_name: rbd-provisioner - release: rbd-provisioner - namespace: kube-system - wait: - timeout: 1800 - labels: - app: rbd-provisioner - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app: rbd-provisioner - values: - global: - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - source: - type: tar - location: http://172.17.0.1:8080/helm_charts/stx-platform/rbd-provisioner-0.1.0.tgz - subpath: rbd-provisioner - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kube-system-cephfs-provisioner -data: - chart_name: cephfs-provisioner - release: cephfs-provisioner - namespace: kube-system - wait: - timeout: 1800 - labels: - app: cephfs-provisioner - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app: cephfs-provisioner - values: - global: - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - source: - type: tar - location: http://172.17.0.1:8080/helm_charts/stx-platform/cephfs-provisioner-0.1.0.tgz - subpath: cephfs-provisioner - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: kube-system-ceph-pools-audit -data: - chart_name: ceph-pools-audit - release: ceph-pools-audit - namespace: kube-system - wait: - timeout: 1800 - labels: - app: rbd-provisioner - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app: ceph-pools-audit - values: - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - source: - type: tar - location: http://172.17.0.1:8080/helm_charts/stx-platform/ceph-pools-audit-0.1.0.tgz - subpath: ceph-pools-audit - reference: master - dependencies: - - helm-toolkit ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: starlingx-ceph-charts -data: - description: StarlingX Ceph Charts - sequenced: true - chart_group: - - kube-system-rbd-provisioner - - kube-system-ceph-pools-audit - - kube-system-cephfs-provisioner ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: platform-integration-manifest -data: - release_prefix: stx - chart_groups: - - starlingx-ceph-charts