From 04ac986684889e8a8e30b169e074ce6bcbc9fb94 Mon Sep 17 00:00:00 2001
From: "DODDA, PRATEEK" <prateek.reddy.dodda@att.com>
Date: Wed, 20 May 2020 11:58:34 -0500
Subject: [PATCH] Enable Apparmor to all Armada test pods

Depends-On: https://review.opendev.org/#/c/731856/

Change-Id: Ib0ea0873d78edd0e3c5f847c84ce89cf151268ca
---
 charts/armada/templates/tests/test-armada-api.yaml | 5 +++--
 charts/armada/values.yaml                          | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charts/armada/templates/tests/test-armada-api.yaml b/charts/armada/templates/tests/test-armada-api.yaml
index a1d41359..9e2063c7 100644
--- a/charts/armada/templates/tests/test-armada-api.yaml
+++ b/charts/armada/templates/tests/test-armada-api.yaml
@@ -22,10 +22,11 @@ Test the Armada API, to ensure that the health endpoint is active and able to re
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ .Release.Name }}-armada-api-test"
+  name: armada-api-test
   annotations:
     "helm.sh/hook": "test-success"
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "armada-api-test" "containerNames" (list "armada-api-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
   labels:
 {{ tuple $envAll "armada" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
@@ -33,7 +34,7 @@ spec:
   nodeSelector:
     {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   containers:
-    - name: "{{ .Release.Name }}-armada-api-test"
+    - name: armada-api-test
       env:
         - name: 'ARMADA_URL'
           value: {{ tuple "armada" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }}
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
index 8c2d979c..5bcf666e 100644
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -232,6 +232,8 @@ pod:
       init: runtime/default
       armada-api: runtime/default
       tiller: runtime/default
+    armada-api-test:
+      armada-api-test: runtime/default
   probes:
     armada:
       api: