From 81b32c522e8ac4e94358a2b6dcd73a3c7c0032cd Mon Sep 17 00:00:00 2001 From: "dt241s@att.com" Date: Fri, 1 May 2020 23:19:21 +0000 Subject: [PATCH] Enable Apparmor to Glance Completed pods Change-Id: Ic8c655a570cfb4121ed1441a4583ce5c1220a8b2 --- glance/templates/job-metadefs-load.yaml | 3 +++ glance/templates/job-storage-init.yaml | 3 +++ glance/values_overrides/apparmor.yaml | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/glance/templates/job-metadefs-load.yaml b/glance/templates/job-metadefs-load.yaml index 319fa11465..be3251407b 100644 --- a/glance/templates/job-metadefs-load.yaml +++ b/glance/templates/job-metadefs-load.yaml @@ -29,6 +29,9 @@ spec: metadata: labels: {{ tuple $envAll "glance" "metadefs_load" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} + annotations: +{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} +{{ dict "envAll" $envAll "podName" "glance-metadefs-load" "containerNames" (list "init" "glance-metadefs-load" ) | 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/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index 9a103db768..3b39581ad1 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -57,6 +57,9 @@ spec: metadata: labels: {{ tuple $envAll "glance" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} + annotations: +{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} +{{ dict "envAll" $envAll "podName" "glance-storage-init" "containerNames" (list "init" "glance-storage-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 7e3fac3b0a..d970159a92 100644 --- a/glance/values_overrides/apparmor.yaml +++ b/glance/values_overrides/apparmor.yaml @@ -8,5 +8,11 @@ pod: glance-registry: glance-registry: runtime/default init: runtime/default + glance-metadefs-load: + init: runtime/default + glance-metadefs-load: runtime/default + glance-storage-init: + init: runtime/default + glance-storage-init: runtime/default manifests: - deployment_registry: true \ No newline at end of file + deployment_registry: true