From 58feaffd3fa0d01625146e4fb7b91530241d53b2 Mon Sep 17 00:00:00 2001 From: Cole Walker Date: Tue, 28 Jul 2020 11:37:55 -0400 Subject: [PATCH] Provide unique name for psp-plugin The application framework requires that plugin names are unique accross all apps loaded on the system. This change ensures that psp plugin does not conflict and can be properly enabled on a system Closes-Bug: 1889019 Change-Id: I187c4f421a3045e6ac4f994fe358891e0a179a1e Signed-off-by: Cole Walker --- .../armada/{manifest_platform.py => manifest_vault.py} | 5 ++++- .../k8sapp_vault/k8sapp_vault/common/constants.py | 2 +- python-k8sapp-vault/k8sapp_vault/setup.cfg | 3 +-- stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/{manifest_platform.py => manifest_vault.py} (78%) diff --git a/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_platform.py b/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py similarity index 78% rename from python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_platform.py rename to python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py index cba1661..a3b04b2 100644 --- a/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_platform.py +++ b/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/armada/manifest_vault.py @@ -8,8 +8,8 @@ """ System inventory Armada manifest operator.""" -from k8sapp_vault.helm.ceph_pools_audit import PSPRolebindingHelm from k8sapp_vault.helm.rbd_provisioner import VaultHelm +from k8sapp_vault.helm.psp_rolebinding import PSPRolebindingHelm from sysinv.common import constants from sysinv.helm import manifest_base as base @@ -20,12 +20,15 @@ class VaultArmadaManifestOperator(base.ArmadaManifestOperator): APP = constants.HELM_APP_VAULT ARMADA_MANIFEST = 'armada-manifest' + CHART_GROUP_PSP_ROLEBINDING = 'vault-psp-rolebinding' CHART_GROUP_VAULT = 'vault' CHART_GROUPS_LUT = { + PSPRolebindingHelm.CHART: CHART_GROUP_PSP_ROLEBINDING, VaultHelm.CHART: CHART_GROUP_VAULT } CHARTS_LUT = { + PSPRolebindingHelm.CHART: 'vault-psp-rolebinding', Vault.CHART: 'vault' } diff --git a/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/common/constants.py b/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/common/constants.py index 7e7603a..6c6e745 100644 --- a/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/common/constants.py +++ b/python-k8sapp-vault/k8sapp_vault/k8sapp_vault/common/constants.py @@ -7,4 +7,4 @@ # Helm: Supported charts: # These values match the names in the chart package's Chart.yaml HELM_CHART_VAULT = 'vault' -HELM_CHART_PSP_ROLEBINDING = 'psp-rolebinding' +HELM_CHART_PSP_ROLEBINDING = 'vault-psp-rolebinding' diff --git a/python-k8sapp-vault/k8sapp_vault/setup.cfg b/python-k8sapp-vault/k8sapp_vault/setup.cfg index 2f68f3c..e4c4cd3 100644 --- a/python-k8sapp-vault/k8sapp_vault/setup.cfg +++ b/python-k8sapp-vault/k8sapp_vault/setup.cfg @@ -34,7 +34,6 @@ systemconfig.helm_applications = systemconfig.helm_plugins.vault = 001_vault = k8sapp_vault.helm.vault:VaultHelm - 002_psp-rolebinding = k8sapp_vault.helm.psp_rolebinding:PSPRolebindingHelm - + 002_vault-psp-rolebinding = k8sapp_vault.helm.psp_rolebinding:PSPRolebindingHelm [wheel] universal = 1 diff --git a/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml b/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml index 448c5cf..e60f797 100644 --- a/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml +++ b/stx-vault-helm/stx-vault-helm/manifests/vault_manifest.yaml @@ -4,7 +4,7 @@ metadata: schema: metadata/Document/v1 name: vault-psp-rolebinding data: - chart_name: psp-rolebinding + chart_name: vault-psp-rolebinding release: vault-psp-rolebinding namespace: vault values: