From d964bff1bf7337a6013ffb74de6c99956ff69bb7 Mon Sep 17 00:00:00 2001
From: "DODDA, PRATEEK" <prateek.reddy.dodda@att.com>
Date: Mon, 18 May 2020 13:25:28 -0500
Subject: [PATCH] Enable Apparmor to all rabbitmq test pods

Change-Id: I60499c39e1cdd1e0657e7ff9241a835cd0b0a266
---
 rabbitmq/templates/job-cluster-wait.yaml | 2 +-
 rabbitmq/templates/pod-test.yaml         | 3 ++-
 rabbitmq/values_overrides/apparmor.yaml  | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rabbitmq/templates/job-cluster-wait.yaml b/rabbitmq/templates/job-cluster-wait.yaml
index 07dd10717..9f5b25fbe 100644
--- a/rabbitmq/templates/job-cluster-wait.yaml
+++ b/rabbitmq/templates/job-cluster-wait.yaml
@@ -63,7 +63,7 @@ spec:
               subPath: erlang_cookie
               readOnly: true
       containers:
-        - name: {{.Release.Name}}-rabbitmq-cluster-wait
+        - name: rabbitmq-rabbitmq-cluster-wait
 {{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "cluster_wait" "container" "rabbitmq_cluster_wait" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           env:
diff --git a/rabbitmq/templates/pod-test.yaml b/rabbitmq/templates/pod-test.yaml
index 45398efeb..bcddfd3ea 100644
--- a/rabbitmq/templates/pod-test.yaml
+++ b/rabbitmq/templates/pod-test.yaml
@@ -33,6 +33,7 @@ metadata:
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
     "helm.sh/hook": test-success
+{{ dict "envAll" $envAll "podName" "rabbitmq-rabbitmq-test" "containerNames" (list "init" "rabbitmq-rabbitmq-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   serviceAccountName: {{ $serviceAccountName }}
@@ -42,7 +43,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
-    - name: {{.Release.Name}}-rabbitmq-test
+    - name: rabbitmq-rabbitmq-test
 {{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
 {{ dict "envAll" $envAll "application" "test" "container" "rabbitmq_test" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
       env:
diff --git a/rabbitmq/values_overrides/apparmor.yaml b/rabbitmq/values_overrides/apparmor.yaml
index c9fce864c..c1092ae2e 100644
--- a/rabbitmq/values_overrides/apparmor.yaml
+++ b/rabbitmq/values_overrides/apparmor.yaml
@@ -14,6 +14,9 @@ pod:
     prometheus-rabbitmq-exporter:
       init: runtime/default
       rabbitmq-exporter: runtime/default
+    rabbitmq-rabbitmq-test:
+      rabbitmq-rabbitmq-test: runtime/default
+      init: runtime/default
 
 monitoring:
   prometheus: