From 56772fdbaa1ac31d9b894e4c526d1a211dc8eecc Mon Sep 17 00:00:00 2001 From: diwakar thyagaraj Date: Tue, 8 Sep 2020 10:55:48 +0000 Subject: [PATCH] [FIX] Remove nginx Container name for apparmor in Glance-registry Ref PS : https://review.opendev.org/#/c/749985/ Change-Id: I52e42500b2573324cec2b6d43d67cda39dad8a31 Signed-off-by: diwakar thyagaraj --- glance/templates/deployment-registry.yaml | 2 +- glance/values_overrides/apparmor.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 2ba918a83e..af789b7d4d 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" "nginx" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} +{{ dict "envAll" $envAll "podName" "glance-registry" "containerNames" ( list "glance-registry" "init" ) | 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 8f09b4ff68..ed6826da49 100644 --- a/glance/values_overrides/apparmor.yaml +++ b/glance/values_overrides/apparmor.yaml @@ -10,7 +10,6 @@ pod: glance-registry: glance-registry: runtime/default init: runtime/default - nginx: runtime/default glance-metadefs-load: init: runtime/default glance-metadefs-load: runtime/default