diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 4ff06c3f77..76c3054407 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} -{{ dict "envAll" $envAll "podName" "glance-api" "containerNames" ( list "glance-perms" "glance-api" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} +{{ dict "envAll" $envAll "podName" "glance-api" "containerNames" ( list "glance-perms" "glance-api" "init" "nginx" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: serviceAccountName: {{ $serviceAccountName }} {{ dict "envAll" $envAll "application" "glance" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 5308453af8..45732ad76a 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} -{{ dict "envAll" $envAll "podName" "glance-registry" "containerNames" ( list "glance-registry" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} +{{ dict "envAll" $envAll "podName" "glance-registry" "containerNames" ( list "glance-registry" "init" "nginx" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: serviceAccountName: {{ $serviceAccountName }} {{ dict "envAll" $envAll "application" "glance" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} diff --git a/glance/values_overrides/apparmor.yaml b/glance/values_overrides/apparmor.yaml index e620e394bf..8f09b4ff68 100644 --- a/glance/values_overrides/apparmor.yaml +++ b/glance/values_overrides/apparmor.yaml @@ -6,9 +6,11 @@ pod: glance-api: runtime/default glance-perms: runtime/default init: runtime/default + nginx: runtime/default glance-registry: glance-registry: runtime/default init: runtime/default + nginx: runtime/default glance-metadefs-load: init: runtime/default glance-metadefs-load: runtime/default @@ -21,4 +23,5 @@ pod: glance-test-ks-user: runtime/default manifests: deployment_registry: true + certificates: true ... diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index e9ac73f80d..effd1381bd 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -55,7 +55,7 @@ spec: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} -{{ dict "envAll" $envAll "podName" "neutron-server" "containerNames" (list "neutron-server" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} +{{ dict "envAll" $envAll "podName" "neutron-server" "containerNames" (list "neutron-server" "init" "neutron-rpc-server") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: {{ dict "envAll" $envAll "application" "neutron_server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} serviceAccountName: {{ $serviceAccountName }} diff --git a/neutron/values_overrides/apparmor.yaml b/neutron/values_overrides/apparmor.yaml index c3a2f007e7..d069dd9fb8 100644 --- a/neutron/values_overrides/apparmor.yaml +++ b/neutron/values_overrides/apparmor.yaml @@ -31,8 +31,11 @@ pod: neutron-server: neutron-server: runtime/default init: runtime/default + neutron-rpc-server: runtime/default neutron-test: init: runtime/default neutron-test: runtime/default neutron-test-ks-user: runtime/default +manifests: + certificates: true ...