Add Docker default AppArmor profile to deckhand

Depends on https://review.opendev.org/#/c/707475/

Change-Id: I320d02bd987bd8af4448694db2f193f83b010a0f
This commit is contained in:
Prateek Dodda 2020-02-11 14:34:17 -06:00
parent e203c15e94
commit 68a3ad1f57
3 changed files with 9 additions and 4 deletions

View File

@ -40,6 +40,7 @@ spec:
{{ $labels | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "deckhand-api" "containerNames" (list "deckhand-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
spec:

View File

@ -325,6 +325,10 @@ conf:
formatter_simple:
format: "%(asctime)s.%(msecs)03d %(process)d %(levelname)s: %(message)s"
pod:
mandatory_access_control:
type: apparmor
deckhand-api:
deckhand-api: runtime/default
security_context:
deckhand:
pod:

View File

@ -30,15 +30,15 @@
args:
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
- name: Deploy Kubernetes with Minikube
- name: Setup Apparmor
shell: |
./tools/deployment/airskiff/developer/010-deploy-k8s.sh
./tools/deployment/airskiff/developer/009-setup-apparmor.sh
args:
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
- name: Setup AppArmor
- name: Deploy Kubernetes with Minikube
shell: |
./tools/deployment/airskiff/developer/015-setup-apparmor.sh
./tools/deployment/airskiff/developer/010-deploy-k8s.sh
args:
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"