From fb0cd00a56aa7d4dd55c38981a94324df34a0b91 Mon Sep 17 00:00:00 2001 From: diwakar thyagaraj Date: Wed, 8 Apr 2020 02:54:31 +0000 Subject: [PATCH] Enable Apparmor to ceph-bootstrap Pods Change-Id: Ifa8d43a2a68fffaea554f04a5df63fb6b7ea5422 Signed-off-by: diwakar thyagaraj --- ceph-mon/templates/job-bootstrap.yaml | 3 +++ ceph-mon/values_overrides/apparmor.yaml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml index e25ec4b69..ef39c0b70 100644 --- a/ceph-mon/templates/job-bootstrap.yaml +++ b/ceph-mon/templates/job-bootstrap.yaml @@ -31,6 +31,9 @@ spec: metadata: labels: {{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} + annotations: +{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} +{{ dict "envAll" $envAll "podName" "ceph-bootstrap" "containerNames" (list "ceph-bootstrap") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: {{ dict "envAll" $envAll "application" "bootstrap" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} serviceAccountName: {{ $serviceAccountName }} diff --git a/ceph-mon/values_overrides/apparmor.yaml b/ceph-mon/values_overrides/apparmor.yaml index 8fb4e088d..5306cb67b 100644 --- a/ceph-mon/values_overrides/apparmor.yaml +++ b/ceph-mon/values_overrides/apparmor.yaml @@ -13,3 +13,7 @@ pod: ceph-storage-keys-generator: ceph-storage-keys-generator: runtime/default init: runtime/default +bootstrap: + enabled: true +manifests: + job_bootstrap: true