diff --git a/centos_iso_image.inc b/centos_iso_image.inc index f103408..02e7757 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -1,2 +1 @@ stx-portieris-helm -stx-portieris-helm-armada diff --git a/stx-portieris-helm/centos/stx-portieris-helm.spec b/stx-portieris-helm/centos/stx-portieris-helm.spec index 325f154..81eef46 100644 --- a/stx-portieris-helm/centos/stx-portieris-helm.spec +++ b/stx-portieris-helm/centos/stx-portieris-helm.spec @@ -2,7 +2,6 @@ %global app_name portieris %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 %global toolkit_version 0.1.0 %global helmchart_version 0.1.0 @@ -32,15 +31,7 @@ BuildRequires: python-k8sapp-portieris BuildRequires: python-k8sapp-portieris-wheels %description -StarlingX Portieris Armada Helm Charts - -%package armada -Summary: StarlingX Portieris Application Armada Helm Charts -Group: base -License: Apache-2.0 - -%description armada -StarlingX Portieris Application Armada Helm Charts +StarlingX Portieris FluxCD Helm Charts %prep %setup @@ -68,13 +59,11 @@ 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/manifest.yaml %{app_staging} mkdir -p %{app_staging}/charts # copy portieris-certs, psp-rolebinding charts @@ -88,21 +77,11 @@ mkdir -p %{app_staging}/plugins cp /plugins/%{app_name}/*.whl %{app_staging}/plugins # Populate metadata -cd %{app_staging} 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 -# calculate checksum of all files in app_staging -find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5 -tar -zcf %{_builddir}/%{app_tarball_armada} -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 @@ -119,13 +98,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-portieris-helm/debian/deb_folder/control b/stx-portieris-helm/debian/deb_folder/control index 6bbea9d..38425c2 100644 --- a/stx-portieris-helm/debian/deb_folder/control +++ b/stx-portieris-helm/debian/deb_folder/control @@ -16,6 +16,6 @@ Package: stx-portieris-helm Section: libs Architecture: any Depends: ${misc:Depends} -Description: StarlingX Portieris Armada Helm Charts - This package contains Armada helm charts for the portieris +Description: StarlingX Portieris FluxCD Helm Charts + This package contains FluxCD helm charts for the portieris application. diff --git a/stx-portieris-helm/debian/deb_folder/rules b/stx-portieris-helm/debian/deb_folder/rules index a6859cc..5bec972 100755 --- a/stx-portieris-helm/debian/deb_folder/rules +++ b/stx-portieris-helm/debian/deb_folder/rules @@ -10,7 +10,6 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.') export APP_NAME = portieris 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 @@ -37,7 +36,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 cp $(HELM_FOLDER)/portieris*.tgz $(STAGING)/charts @@ -51,12 +49,7 @@ override_dh_auto_build: mkdir -p $(STAGING)/plugins cp /plugins/$(APP_NAME)/*.whl $(STAGING)/plugins - # Create the app package for the armada 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)/manifest.yaml cp -R fluxcd-manifests $(STAGING)/ # calculate checksum of all files in staging for the fluxcd app @@ -70,7 +63,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-portieris-helm/stx-portieris-helm/manifests/manifest.yaml b/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml deleted file mode 100644 index c9d1419..0000000 --- a/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml +++ /dev/null @@ -1,114 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: portieris-certs -data: - chart_name: portieris-certs - release: portieris-certs - namespace: portieris - wait: - timeout: 30 - native: - enabled: true - resources: [] - install: - no_hooks: false - upgrade: - no_hooks: false - source: - type: tar - location: http://172.17.0.1/helm_charts/stx-platform/portieris-certs-0.1.0.tgz - subpath: portieris-certs - reference: master - dependencies: [] - values: - caCert: "" ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: portieris -data: - chart_name: portieris - release: portieris - namespace: portieris - wait: - timeout: 300 - labels: - app: portieris - install: - no_hooks: false - upgrade: - no_hooks: false - source: - type: tar - location: http://172.17.0.1/helm_charts/stx-platform/portieris-0.7.0.tgz - subpath: portieris - reference: master - dependencies: [] - values: - replicaCount: 3 - namespace: portieris - images: - tags: - portieris: docker.io/starlingx/portieris:stx.5.0-v0.7.0 - image: - host: registry.local:9001/docker.io/starlingx - image: portieris - tags: stx.5.0-v0.7.0 - tag: stx.5.0-v0.7.0 - IBMContainerService: false - SkipSecretCreation: true - UseCertManager: true ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: portieris-psp-rolebinding -data: - chart_name: portieris-psp-rolebinding - release: portieris-psp-rolebinding - namespace: portieris - values: - rolebindingNamespace: portieris - serviceAccount: portieris - 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: portieris-psp-rolebinding - type: job - wait: - labels: - release_group: portieris-psp-rolebinding - resources: [] - timeout: 1800 - dependencies: [] ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: portieris-charts -data: - description: "StarlingX Portieris" - sequenced: true - chart_group: - - portieris-psp-rolebinding - - portieris-certs - - portieris ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: portieris-manifest -data: - release_prefix: 'portieris' - chart_groups: - - portieris-charts