Remove psp-rolebinding from portieris-aramda-app

Removed the psp-rolebinding helm chart from being
packaged as part of portieris-armada-app.

PASS: Build pkgs
PASS: system-application apply portieris
PASS: application pkg doesn't consist psp-rolebinding
      helm chart

Story: 2010590
Task: 47768

Signed-off-by: Rahul Roshan Kachchap <rahulroshan.kachchap@windriver.com>
Change-Id: I9a5c6c8900c0b9793a2313d3065356ec0333ddb2

python3-k8sapp-portieris/k8sapp_portieris/k8sapp_portieris/common/constants.py

@@ -9,5 +9,4 @@
 HELM_APP_PORTIERIS = 'portieris'
 HELM_CHART_PORTIERIS = 'portieris'
 HELM_CHART_PORTIERIS_CERTS = 'portieris-certs'
-HELM_CHART_PSP_ROLEBINDING = 'portieris-psp-rolebinding'
 HELM_NS_PORTIERIS = 'portieris'

python3-k8sapp-portieris/k8sapp_portieris/k8sapp_portieris/helm/psp_rolebinding.py

@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2020 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from k8sapp_portieris.common import constants
-
-from sysinv.common import exception
-
-from sysinv.helm import base
-
-
-class PSPRolebindingHelm(base.BaseHelm):
-    """Class to encapsulate helm operations for the psp rolebinding chart"""
-
-    SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + \
-        [constants.HELM_NS_PORTIERIS]
-    SUPPORTED_APP_NAMESPACES = {
-        constants.HELM_APP_PORTIERIS:
-            base.BaseHelm.SUPPORTED_NAMESPACES + [constants.HELM_NS_PORTIERIS],
-    }
-
-    CHART = constants.HELM_CHART_PSP_ROLEBINDING
-    SERVICE_NAME = 'psp-rolebinding'
-
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
-    def get_overrides(self, namespace=None):
-        overrides = {
-            constants.HELM_NS_PORTIERIS: {}
-        }
-
-        if namespace in self.SUPPORTED_NAMESPACES:
-            return overrides[namespace]
-        elif namespace:
-            raise exception.InvalidHelmNamespace(chart=self.CHART,
-                                                 namespace=namespace)
-        else:
-            return overrides

python3-k8sapp-portieris/k8sapp_portieris/setup.cfg

@@ -33,9 +33,8 @@ systemconfig.helm_applications =
     portieris = systemconfig.helm_plugins.portieris
 
 systemconfig.helm_plugins.portieris =
-    001_portieris-psp-rolebinding = k8sapp_portieris.helm.psp_rolebinding:PSPRolebindingHelm
+    001_portieris-certs = k8sapp_portieris.helm.portieris_certs:PortierisCertsHelm
-    002_portieris-certs = k8sapp_portieris.helm.portieris_certs:PortierisCertsHelm
+    002_portieris = k8sapp_portieris.helm.portieris:PortierisHelm
-    003_portieris = k8sapp_portieris.helm.portieris:PortierisHelm
 
 systemconfig.app_lifecycle =
     portieris = k8sapp_portieris.lifecycle.lifecycle_portieris:PortierisAppLifecycleOperator

stx-portieris-helm/debian/deb_folder/rules

@@ -28,7 +28,6 @@ override_dh_auto_build:
 	# Create the TGZ file.
 	cd helm-charts && helm lint portieris-certs
 	cd helm-charts && helm package portieris-certs
-	cd helm-charts && $(MAKE) psp-rolebinding
 
 	# Terminate the helm chart server.
 	pkill chartmuseum
@@ -37,7 +36,6 @@ override_dh_auto_build:
 	mkdir -p $(STAGING)
 	cp files/metadata.yaml $(STAGING)
 	mkdir -p $(STAGING)/charts
-	cp helm-charts/*.tgz $(STAGING)/charts
 	cp $(HELM_FOLDER)/portieris*.tgz $(STAGING)/charts
 
 	# Populate metadata.

stx-portieris-helm/debian/meta_data.yaml

@@ -2,13 +2,9 @@
 debname: stx-portieris-helm
 debver: 1.0-1
 src_path: stx-portieris-helm
-src_files:
-  - ${MY_REPO}/stx/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts
 revision:
   dist: $STX_DIST
   stx_patch: 3
-  FILES_GITREVCOUNT:
-    - d0c56528d291dacd739c47774359a3bbb3e1c1b4
   GITREVCOUNT:
     SRC_DIR: ${MY_REPO}/stx/portieris-armada-app
     BASE_SRCREV: b2f895c371539899f7c9543c9c5dba8a897a1be3

stx-portieris-helm/stx-portieris-helm/fluxcd-manifests/kustomization.yaml

@@ -11,4 +11,3 @@ resources:
   - base
   - portieris-certs
   - portieris
-  - portieris-psp-rolebinding

stx-portieris-helm/stx-portieris-helm/fluxcd-manifests/portieris-psp-rolebinding/helmrelease.yaml

@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
-kind: HelmRelease
-metadata:
-  name: portieris-psp-rolebinding
-  labels:
-    chart_group: portieris-charts
-spec:
-  releaseName: portieris-portieris-psp-rolebinding
-  chart:
-    spec:
-      chart: psp-rolebinding
-      version: 0.1.0
-      sourceRef:
-        kind: HelmRepository
-        name: stx-platform
-  interval: 1m
-  timeout: 30m
-  test:
-    enable: false
-  install:
-    disableHooks: false
-  upgrade:
-    disableHooks: false
-  valuesFrom:
-    - kind: Secret
-      name: portieris-psp-rolebinding-static-overrides
-      valuesKey: portieris-psp-rolebinding-static-overrides.yaml
-    - kind: Secret
-      name: portieris-psp-rolebinding-system-overrides
-      valuesKey: portieris-psp-rolebinding-system-overrides.yaml

stx-portieris-helm/stx-portieris-helm/fluxcd-manifests/portieris-psp-rolebinding/kustomization.yaml

@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-namespace: portieris
-resources:
-  - helmrelease.yaml
-secretGenerator:
-  - name: portieris-psp-rolebinding-static-overrides
-    files:
-      - portieris-psp-rolebinding-static-overrides.yaml
-  - name: portieris-psp-rolebinding-system-overrides
-    files:
-      - portieris-psp-rolebinding-system-overrides.yaml
-generatorOptions:
-  disableNameSuffixHash: true

stx-portieris-helm/stx-portieris-helm/fluxcd-manifests/portieris-psp-rolebinding/portieris-psp-rolebinding-static-overrides.yaml

@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-rolebindingNamespace: portieris
-serviceAccount: portieris

stx-portieris-helm/stx-portieris-helm/fluxcd-manifests/portieris-psp-rolebinding/portieris-psp-rolebinding-system-overrides.yaml

@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-