Merge "Enable Apparmor to all rabbitmq test pods"

This commit is contained in:
Zuul 2020-05-20 00:51:55 +00:00 committed by Gerrit Code Review
commit 8a8eb3b8ed
3 changed files with 6 additions and 2 deletions
rabbitmq

@ -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:

@ -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:

@ -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: