From 9f897d33e405b4bf3c71addec7d3a9ef1b5c5fd2 Mon Sep 17 00:00:00 2001 From: "DODDA, PRATEEK" Date: Wed, 20 May 2020 11:10:29 -0500 Subject: [PATCH] Enabling Apparmor for maas test containers Change-Id: I935f2fb265656b7e5f630c3ae215dddcf334fd02 --- charts/maas/templates/tests/test-maas-init.yaml | 3 ++- charts/maas/values.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/maas/templates/tests/test-maas-init.yaml b/charts/maas/templates/tests/test-maas-init.yaml index 1f4d161..456340a 100644 --- a/charts/maas/templates/tests/test-maas-init.yaml +++ b/charts/maas/templates/tests/test-maas-init.yaml @@ -26,6 +26,7 @@ metadata: annotations: "helm.sh/hook": "test-success" {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} +{{ dict "envAll" $envAll "podName" "maas-api-test" "containerNames" (list "maas-api-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }} labels: {{ tuple $envAll "maas" "init-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 }}-api-test" + - name: maas-api-test env: - name: 'MAAS_URL' value: {{ tuple "maas_region" "internal" "region_api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | quote }} diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml index 578cdbc..c8b49d1 100644 --- a/charts/maas/values.yaml +++ b/charts/maas/values.yaml @@ -319,6 +319,8 @@ pod: maas-import-resources: region-import-resources: runtime/default init: runtime/default + maas-api-test: + maas-api-test: runtime/default security_context: maas-syslog: pod: