Make plugins that are common across applications unique

The current implementation of the application framework requires that
plugin names are unique across all applications loaded on the system.
This adjusts the PSP RoleBinding and Helm Toolkit plugins so they don't
conflict with other applications.

Change-Id: Ia5e301d869a4e7200e92010e30f0ee93f2590472
Story: 2006537
Task: 40154
Signed-off-by: Robert Church <robert.church@windriver.com>

python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py

@@ -38,6 +38,7 @@ from k8sapp_openstack.helm.panko import PankoHelm
 from k8sapp_openstack.helm.placement import PlacementHelm
 from k8sapp_openstack.helm.rabbitmq import RabbitmqHelm
 from k8sapp_openstack.helm.swift import SwiftHelm
+from k8sapp_openstack.helm.psp_rolebinding import PSPRolebindingHelm
 
 from sysinv.common import constants
 from sysinv.common import exception
@@ -53,6 +54,7 @@ class OpenstackArmadaManifestOperator(base.ArmadaManifestOperator):
 
     CHART_INGRESS_KS = CHART_GROUP_INGRESS_KS = 'kube-system-ingress'
 
+    CHART_GROUP_PSP_ROLEBINDING = 'openstack-psp-rolebinding'
     CHART_GROUP_INGRESS_OS = 'openstack-ingress'
     CHART_GROUP_MAGNUM = 'openstack-magnum'
     CHART_GROUP_MARIADB = 'openstack-mariadb'
@@ -97,6 +99,7 @@ class OpenstackArmadaManifestOperator(base.ArmadaManifestOperator):
         OpenvswitchHelm.CHART: CHART_GROUP_COMPUTE_KIT,
         PankoHelm.CHART: CHART_GROUP_TELEMETRY,
         PlacementHelm.CHART: CHART_GROUP_COMPUTE_KIT,
+        PSPRolebindingHelm.CHART: CHART_GROUP_PSP_ROLEBINDING,
         RabbitmqHelm.CHART: CHART_GROUP_RABBITMQ,
         SwiftHelm.CHART: CHART_GROUP_SWIFT,
         DcdbsyncHelm.CHART: CHART_GROUP_DCDBSYNC,
@@ -127,6 +130,7 @@ class OpenstackArmadaManifestOperator(base.ArmadaManifestOperator):
         NovaApiProxyHelm.CHART: 'openstack-nova-api-proxy',
         OpenvswitchHelm.CHART: 'openstack-openvswitch',
         PankoHelm.CHART: 'openstack-panko',
+        PSPRolebindingHelm.CHART: 'openstack-psp-rolebinding',
         PlacementHelm.CHART: 'openstack-placement',
         RabbitmqHelm.CHART: 'openstack-rabbitmq',
         SwiftHelm.CHART: 'openstack-ceph-rgw',

python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py

@@ -15,7 +15,7 @@ HELM_CHART_GARBD = 'garbd'
 HELM_CHART_GLANCE = 'glance'
 HELM_CHART_GNOCCHI = 'gnocchi'
 HELM_CHART_HEAT = 'heat'
-HELM_CHART_HELM_TOOLKIT = 'helm-toolkit'
+HELM_CHART_HELM_TOOLKIT = 'openstack-helm-toolkit'
 HELM_CHART_HORIZON = 'horizon'
 HELM_CHART_INGRESS = 'ingress'
 HELM_CHART_IRONIC = 'ironic'
@@ -35,4 +35,4 @@ HELM_CHART_PLACEMENT = 'placement'
 HELM_CHART_RABBITMQ = 'rabbitmq'
 HELM_CHART_SWIFT = 'ceph-rgw'
 HELM_CHART_DCDBSYNC = 'dcdbsync'
-HELM_CHART_PSP_ROLEBINDING = 'psp-rolebinding'
+HELM_CHART_PSP_ROLEBINDING = 'openstack-psp-rolebinding'

python-k8sapp-openstack/k8sapp_openstack/setup.cfg

@@ -52,7 +52,7 @@ systemconfig.helm_plugins.stx_openstack =
     017_ceilometer = k8sapp_openstack.helm.ceilometer:CeilometerHelm
     018_panko = k8sapp_openstack.helm.panko:PankoHelm
     019_aodh = k8sapp_openstack.helm.aodh:AodhHelm
-    020_helm-toolkit = k8sapp_openstack.helm.helm_toolkit:HelmToolkitHelm
+    020_openstack-helm-toolkit = k8sapp_openstack.helm.helm_toolkit:HelmToolkitHelm
     021_barbican = k8sapp_openstack.helm.barbican:BarbicanHelm
     022_keystone-api-proxy = k8sapp_openstack.helm.keystone_api_proxy:KeystoneApiProxyHelm
     023_ceph-rgw = k8sapp_openstack.helm.swift:SwiftHelm
@@ -61,7 +61,7 @@ systemconfig.helm_plugins.stx_openstack =
     026_nginx-ports-control = k8sapp_openstack.helm.nginx_ports_control:NginxPortsControlHelm
     027_fm-rest-api = k8sapp_openstack.helm.fm_rest_api:FmRestApiHelm
     028_dcdbsync = k8sapp_openstack.helm.dcdbsync:DcdbsyncHelm
-    029_psp-rolebinding = k8sapp_openstack.helm.psp_rolebinding:PSPRolebindingHelm
+    029_openstack-psp-rolebinding = k8sapp_openstack.helm.psp_rolebinding:PSPRolebindingHelm
 
 systemconfig.armada.manifest_ops =
     stx-openstack = k8sapp_openstack.armada.manifest_openstack:OpenstackArmadaManifestOperator

stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml

@@ -4,7 +4,7 @@ metadata:
   schema: metadata/Document/v1
   name: openstack-psp-rolebinding
 data:
-  chart_name: psp-rolebinding
+  chart_name: openstack-psp-rolebinding
   dependencies: []
   namespace: openstack
   release: openstack-psp-rolebinding
@@ -34,7 +34,7 @@ metadata:
   schema: metadata/Document/v1
   name: helm-toolkit
 data:
-  chart_name: helm-toolkit
+  chart_name: openstack-helm-toolkit
   release: helm-toolkit
   namespace: helm-toolkit
   values: {}