airship/maas
Code Issues Proposed changes

Merge "Enabling Apparmor for maas test containers"

Browse Source
This commit is contained in:
Zuul 2020-05-27 14:59:55 +00:00 committed by Gerrit Code Review
commit 8f35260091
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/maas/templates/tests/test-maas-init.yaml
View File

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

2
charts/maas/values.yaml
View File

@ -329,6 +329,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: