diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 21e3726..ca68b37 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -1,2 +1 @@ stx-ptp-notification-helm -stx-ptp-notification-helm-armada diff --git a/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec b/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec index 9fefb4a..e752f67 100644 --- a/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec +++ b/stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec @@ -7,8 +7,6 @@ %global app_name ptp-notification %global helm_repo stx-platform -%global armada_folder /usr/lib/armada - # Install location %global app_folder /usr/local/share/applications/helm @@ -34,15 +32,7 @@ BuildRequires: python-k8sapp-ptp-notification BuildRequires: python-k8sapp-ptp-notification-wheels %description -StarlingX PTP Notification Helm Charts - -%package armada -Summary: StarlingX PTP Notification Application Armada Helm Charts -Group: base -License: Apache-2.0 - -%description armada -StarlingX PTP Notification Application Armada Helm Charts +StarlingX PTP Notification FluxCD Helm Charts %prep %setup -n %{name}-%{version} @@ -63,19 +53,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/ptp_notification_manifest.yaml %{app_staging} mkdir -p %{app_staging}/charts cp helm-charts/*.tgz %{app_staging}/charts -#cp %{helm_folder}/*.tgz %{app_staging}/charts -cd %{app_staging} # Populate metadata sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml @@ -86,14 +71,7 @@ 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 -# package it up -find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 -tar -zcf %armada_app_path -C %{app_staging}/ . - # package fluxcd -rm -f %{app_staging}/ptp_notification_manifest.yaml - -cd - cp -R fluxcd-manifests %{app_staging}/ # calculate checksum of all files in app_staging @@ -108,13 +86,8 @@ 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} -%files armada -%defattr(-,root,root,-) -%{app_folder}/%{app_tarball_armada} - %files %defattr(-,root,root,-) %{app_folder}/%{app_tarball_fluxcd} diff --git a/stx-ptp-notification-helm/debian/deb_folder/control b/stx-ptp-notification-helm/debian/deb_folder/control index e4dfc6b..7d27fba 100644 --- a/stx-ptp-notification-helm/debian/deb_folder/control +++ b/stx-ptp-notification-helm/debian/deb_folder/control @@ -15,6 +15,6 @@ Package: stx-ptp-notification-helm Section: libs Architecture: any Depends: ${misc:Depends} -Description: StarlingX PTP Notification Armada Helm Charts - This package contains Armada helm charts for the PTP notification +Description: StarlingX PTP Notification FluxCD Helm Charts + This package contains FluxCD helm charts for the PTP notification application. diff --git a/stx-ptp-notification-helm/debian/deb_folder/rules b/stx-ptp-notification-helm/debian/deb_folder/rules index 5992809..f426fe4 100755 --- a/stx-ptp-notification-helm/debian/deb_folder/rules +++ b/stx-ptp-notification-helm/debian/deb_folder/rules @@ -10,7 +10,6 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.') export APP_NAME = ptp-notification 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 @@ -36,7 +35,6 @@ override_dh_auto_build: # Setup the staging directory. mkdir -p $(STAGING) cp files/metadata.yaml $(STAGING) - cp manifests/*.yaml $(STAGING) mkdir -p $(STAGING)/charts cp helm-charts/*.tgz $(STAGING)/charts @@ -49,12 +47,7 @@ override_dh_auto_build: mkdir -p $(STAGING)/plugins cp /plugins/$(APP_NAME)/*.whl $(STAGING)/plugins - # Create the app package. - cd $(STAGING) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 - tar cfz $(APP_TARBALL_ARMADA) -C $(STAGING)/ . - # Prepare staging for fluxcd package - rm -f $(STAGING)/ptp_notification_manifest.yaml cp -R fluxcd-manifests $(STAGING)/ # Calculate checksum of all files in staging for the fluxcd app @@ -68,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_usrlocal: diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/manifests/ptp_notification_manifest.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/manifests/ptp_notification_manifest.yaml deleted file mode 100644 index e309ef4..0000000 --- a/stx-ptp-notification-helm/stx-ptp-notification-helm/manifests/ptp_notification_manifest.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ptp-notification-psp-rolebinding -data: - chart_name: ptp-notification-psp-rolebinding - release: ptp-notification-psp-rolebinding - namespace: notification - values: - rolebindingNamespace: notification - serviceAccount: notification - 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: ptp-notification-psp-rolebinding - type: job - wait: - labels: - release_group: ptp-notification-psp-rolebinding - resources: [] - timeout: 1800 - dependencies: [] ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ptp-notification -data: - chart_name: ptp-notification - release: ptp-notification - namespace: notification - wait: - timeout: 1800 - labels: - app: ptp-notification - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app: ptp-notification - values: - replicaCount: 1 - source: - type: tar - location: http://172.17.0.1/helm_charts/stx-platform/ptp-notification-0.1.0.tgz - subpath: ptp-notification - reference: master - dependencies: [] ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: ptp-notification -data: - description: "Deploy PTP Notification" - sequenced: false - chart_group: - - ptp-notification - - ptp-notification-psp-rolebinding ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: ptp-notification-manifest -data: - release_prefix: ptp - chart_groups: - - ptp-notification \ No newline at end of file