From da5879141824a64ab4231d627eedcf967840fbd5 Mon Sep 17 00:00:00 2001
From: "Dodda, Prateek" <prateek.reddy.dodda@att.com>
Date: Thu, 30 Apr 2020 11:52:47 -0500
Subject: [PATCH] Enabling Apparmor fo rabbimq Init conatiners

Change-Id: I7b8306288503d066113a2bf410ef4a77a64c553c
---
 rabbitmq/templates/job-cluster-wait.yaml | 2 +-
 rabbitmq/templates/statefulset.yaml      | 2 +-
 rabbitmq/values_overrides/apparmor.yaml  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rabbitmq/templates/job-cluster-wait.yaml b/rabbitmq/templates/job-cluster-wait.yaml
index 3a3976cda..92421b57a 100644
--- a/rabbitmq/templates/job-cluster-wait.yaml
+++ b/rabbitmq/templates/job-cluster-wait.yaml
@@ -37,7 +37,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" "rabbitmq-cluster-wait" "containerNames" (list "rabbitmq-cookie" "rabbitmq-rabbitmq-cluster-wait" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+{{ dict "envAll" $envAll "podName" "rabbitmq-cluster-wait" "containerNames" (list "init" "rabbitmq-cookie" "rabbitmq-rabbitmq-cluster-wait" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "cluster_wait" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 9e40a103d..f624db5ea 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -77,7 +77,7 @@ spec:
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
         secret-rabbit-admin-hash: {{ tuple "secret-rabbit-admin.yaml" . | include "helm-toolkit.utils.hash" }}
         secret-erlang-cookie-hash: {{ tuple "secret-erlang-cookie.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ dict "envAll" $envAll "podName" "rabbitmq" "containerNames" (list "rabbitmq-password" "rabbitmq-cookie" "rabbitmq-perms" "rabbitmq") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+{{ dict "envAll" $envAll "podName" "rabbitmq" "containerNames" (list "init" "rabbitmq-password" "rabbitmq-cookie" "rabbitmq-perms" "rabbitmq") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $rcControllerName | quote }}
diff --git a/rabbitmq/values_overrides/apparmor.yaml b/rabbitmq/values_overrides/apparmor.yaml
index 749158b22..c9fce864c 100644
--- a/rabbitmq/values_overrides/apparmor.yaml
+++ b/rabbitmq/values_overrides/apparmor.yaml
@@ -2,9 +2,11 @@ pod:
   mandatory_access_control:
     type: apparmor
     rabbitmq-cluster-wait:
+      init: runtime/default
       rabbitmq-cookie: runtime/default
       rabbitmq-rabbitmq-cluster-wait: runtime/default
     rabbitmq:
+      init: runtime/default
       rabbitmq-password: runtime/default
       rabbitmq-cookie: runtime/default
       rabbitmq-perms: runtime/default