From 039ab18be952a718e24d81147a4bd2ec975a9b92 Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Fri, 5 Aug 2022 10:13:09 -0300 Subject: [PATCH] Remove nginx-ingress-controller 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: rpm package has no armada tarball PASS: deb package has no armada tarball PASS: FluxCD package is unchanged Story: 2009138 Task: 45960 Signed-off-by: Lucas Cavalcante Change-Id: Id66f17cc121d7612dfeb48ecdecfdc1a3ad2e404 --- .../centos/build_srpm.data | 4 - .../stx-nginx-ingress-controller-helm.spec | 7 +- .../debian/deb_folder/control | 4 +- .../debian/deb_folder/rules | 53 ---------- .../debian/meta_data.yaml | 4 - .../nginx_ingress_controller_manifest.yaml | 99 ------------------- 6 files changed, 3 insertions(+), 168 deletions(-) delete mode 100644 stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml diff --git a/stx-nginx-ingress-controller-helm/centos/build_srpm.data b/stx-nginx-ingress-controller-helm/centos/build_srpm.data index 722a37b..dd84f12 100644 --- a/stx-nginx-ingress-controller-helm/centos/build_srpm.data +++ b/stx-nginx-ingress-controller-helm/centos/build_srpm.data @@ -2,14 +2,10 @@ SRC_DIR="stx-nginx-ingress-controller-helm" CHART_TAR_NAME=helm-charts-ingress-nginx -ARMADA_NGINX_VERSION=0.41.2 -ARMADA_TAR="$CHART_TAR_NAME-$ARMADA_NGINX_VERSION.tar.gz" - FLUXCD_NGINX_VERSION=1.1.1 FLUXCD_TAR="$CHART_TAR_NAME-$FLUXCD_NGINX_VERSION.tar.gz" COPY_LIST=" \ - ${CGCS_BASE}/downloads/$ARMADA_TAR \ ${CGCS_BASE}/downloads/$FLUXCD_TAR \ $PKG_BASE/$SRC_DIR/files/*.patch \ " diff --git a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec b/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec index 0141499..b5926c7 100644 --- a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec +++ b/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec @@ -1,11 +1,8 @@ # Application tunables (maps to metadata) %global app_name nginx-ingress-controller %global helm_repo stx-platform -%global armada_nginx_version 0.41.2 %global fluxcd_nginx_version 1.1.1 -%global armada_folder /usr/lib/armada - # Install location %global app_folder /usr/local/share/applications/helm @@ -14,7 +11,6 @@ %global toolkit_version 0.1.0 Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts -#StarlingX Nginx Ingress Controller Application Armada Helm Charts Name: stx-nginx-ingress-controller-helm Version: 1.1 Release: %{tis_patch_ver}%{?_tis_dist} @@ -25,7 +21,6 @@ URL: unknown Source0: %{name}-%{version}.tar.gz -# fluxcd specific source items Source1: helm-charts-ingress-nginx-%{fluxcd_nginx_version}.tar.gz BuildArch: noarch @@ -55,7 +50,7 @@ chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --sto sleep 2 helm repo add local http://localhost:8879/charts -# Create the tgz file for armada +# Make Chart cd %{_builddir}/stx-nginx-ingress-controller-helm-%{version} cp files/Makefile %{_builddir}/helm-charts/charts cd %{_builddir}/helm-charts/charts diff --git a/stx-nginx-ingress-controller-helm/debian/deb_folder/control b/stx-nginx-ingress-controller-helm/debian/deb_folder/control index fd837ad..d4254e6 100644 --- a/stx-nginx-ingress-controller-helm/debian/deb_folder/control +++ b/stx-nginx-ingress-controller-helm/debian/deb_folder/control @@ -15,6 +15,6 @@ Package: stx-nginx-ingress-controller-helm Section: libs Architecture: any Depends: ${misc:Depends} -Description: StarlingX Nginx Ingress Controller Application FluxCD/Armada Helm Charts - This package contains Fluxcd/Armada helm charts for the nginx ingress +Description: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts + This package contains Fluxcd helm charts for the nginx ingress controller application. diff --git a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules index ff615bb..34f03a9 100755 --- a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules +++ b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules @@ -10,12 +10,9 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.') export APP_NAME = nginx-ingress-controller 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 ARMADA_NGINX_PKG = helm-charts-ingress-nginx-0.41.2.tar.gz export FLUXCD_NGINX_PKG = helm-charts-ingress-nginx-1.1.1.tar.gz %: @@ -23,55 +20,6 @@ export FLUXCD_NGINX_PKG = helm-charts-ingress-nginx-1.1.1.tar.gz override_dh_auto_build: - ############ - # ARMADA # - ############ - # Setup tar source - tar xfz $(ARMADA_NGINX_PKG) - # Move the extracted helm chart files to the top level build directory. - # Remove the helm-charts Makefile first so it doesn't overwrite our Makefile. - rm helm-charts/Makefile - mv helm-charts/* . - - # Apply the daemonset tolerations patch to armada - patch --no-backup-if-mismatch --fuzz=0 -p1 < files/0001-add-toleration-armada.patch - - # Host a server for the helm charts. - chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" \ - --storage-local-rootdir="." & - sleep 2 - helm repo add local http://localhost:8879/charts - - # Create the TGZ file. - cp files/Makefile charts - cd charts && make ingress-nginx - - # Terminate the helm chart server. - pkill chartmuseum - - # Setup the staging directory. - mkdir -p $(STAGING_ARMADA) - cp files/metadata.yaml $(STAGING_ARMADA) - cp manifests/nginx_ingress_controller_manifest.yaml $(STAGING_ARMADA) - mkdir -p $(STAGING_ARMADA)/charts - cp 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 armada 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 # ############ @@ -124,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) override_dh_auto_test: diff --git a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml index ef74919..1157e30 100644 --- a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml +++ b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml @@ -3,10 +3,6 @@ debname: stx-nginx-ingress-controller-helm debver: 1.0-1 src_path: stx-nginx-ingress-controller-helm dl_files: - helm-charts-ingress-nginx-0.41.2.tar.gz: - topdir: helm-charts - url: https://github.com/kubernetes/ingress-nginx/archive/controller-v0.41.2.tar.gz - md5sum: de3a31c8622c3de6f910617698d14b62 helm-charts-ingress-nginx-1.1.1.tar.gz: topdir: helm-charts url: https://github.com/kubernetes/ingress-nginx/archive/controller-v1.1.1.tar.gz diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml deleted file mode 100644 index 30da7cd..0000000 --- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml +++ /dev/null @@ -1,99 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: nginx-ingress -data: - chart_name: ingress-nginx - release: nginx-ingress - namespace: kube-system - wait: - timeout: 1800 - labels: - app.kubernetes.io/name: ingress-nginx - install: - no_hooks: false - upgrade: - no_hooks: false - pre: - delete: - - type: job - labels: - app.kubernetes.io/name: ingress-nginx - values: - imagePullSecrets: [{"name": "default-registry-key"}] - controller: - kind: DaemonSet - image: - # cleans the default digest value since sysinv changes the digest when pushing the image to the local registry - digest: "" - daemonset: - useHostPort: false - nodeSelector: - node-role.kubernetes.io/master: "" - config: - # https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/ - nginx-status-ipv4-whitelist: 0.0.0.0/0 - # See https://bugs.launchpad.net/starlingx/+bug/1823803 - # Note quotes are necessary. - worker-processes: '1' - scope: - enabled: false - service: - type: "" - hostNetwork: true - livenessProbe: - initialDelaySeconds: 30 - readinessProbe: - initialDelaySeconds: 30 - admissionWebhooks: - # default port 8443 conflicts with lighttpd using https - port: 5443 - patch: - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - extraVolumes: - - name: pod-tmp - emptyDir: {} - extraVolumeMounts: - - name: pod-tmp - mountPath: /tmp - defaultBackend: - image: - repository: k8s.gcr.io/defaultbackend - tag: "1.4" - nodeSelector: - node-role.kubernetes.io/master: "" - service: - type: "" - livenessProbe: - initialDelaySeconds: 30 - readinessProbe: - initialDelaySeconds: 30 - source: - type: tar - location: http://172.17.0.1/helm_charts/stx-platform/ingress-nginx-3.10.1.tgz - subpath: ingress-nginx - reference: master - dependencies: [] ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: nginx-ingress -data: - description: "Deploy Nginx Ingress Controller" - sequenced: false - chart_group: - - nginx-ingress ---- -schema: armada/Manifest/v1 -metadata: - schema: metadata/Document/v1 - name: nginx-ingress-controller-manifest -data: - release_prefix: ic - chart_groups: - - nginx-ingress