airship
/
shipyard
Code Issues Proposed changes

Merge "Adding default apparmor profile to shipyard components"

This commit is contained in:
Zuul 2020-02-19 14:28:54 +00:00 committed by Gerrit Code Review
parent dfa51979c2 5aa0cde5f0
commit 30f3a989c7
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charts/shipyard/templates/deployment-shipyard.yaml
View File

@ -44,6 +44,7 @@ spec:
shipyard-configmap-etc-hash: {{ tuple "configmap-shipyard-etc.yaml" . | include "helm-toolkit.utils.hash" }} shipyard-configmap-etc-hash: {{ tuple "configmap-shipyard-etc.yaml" . | include "helm-toolkit.utils.hash" }}
airflow-configmap-bin-hash: {{ tuple "configmap-airflow-bin.yaml" . | include "helm-toolkit.utils.hash" }} airflow-configmap-bin-hash: {{ tuple "configmap-airflow-bin.yaml" . | include "helm-toolkit.utils.hash" }}
airflow-configmap-etc-hash: {{ tuple "configmap-airflow-etc.yaml" . | include "helm-toolkit.utils.hash" }} airflow-configmap-etc-hash: {{ tuple "configmap-airflow-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ dict "envAll" $envAll "podName" "shipyard-api" "containerNames" (list "shipyard-api" "airflow-web") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "shipyard" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "shipyard" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}

1
charts/shipyard/templates/statefulset-airflow-worker.yaml
View File

@ -86,6 +86,7 @@ spec:
{{ $labels | indent 8 }} {{ $labels | indent 8 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "airflow-worker" "containerNames" (list "airflow-worker" "airflow-scheduler" "airflow-logrotate") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
affinity: affinity:

9
charts/shipyard/values.yaml
View File

@ -717,6 +717,15 @@ conf:
#Shipyard is not using this #Shipyard is not using this
# End of Airflow config options # End of Airflow config options
pod: pod:
mandatory_access_control:
type: apparmor
shipyard-api:
shipyard-api: runtime/default
airflow-web: runtime/default
airflow-worker:
airflow-worker: runtime/default
airflow-scheduler: runtime/default
airflow-logrotate: runtime/default
security_context: security_context:
shipyard: shipyard:
pod: pod:

8
tools/gate/playbooks/airskiff-deploy.yaml
View File

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