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 <cole.walker@windriver.com>
This commit is contained in:
parent
75ede556c2
commit
58feaffd3f
|
@ -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'
|
||||
}
|
||||
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue