openstack/openstack-helm-infra
Code Issues Proposed changes

Ingress: add apparmor profile to ingress init containers

Browse Source 
concat is not available in helm 14.1, using work around
to emulate this functionality.

Change-Id: Iccbc5de567be1c899b7f5d47cf43b6e962c27e91
This commit is contained in:
KHIYANI, RAHUL (rk0850) 2020-06-03 10:37:49 -05:00 committed by Rahul Khiyani
parent d88b553727
commit ae278c674e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ingress/templates/deployment-ingress.yaml
View File

@ -178,10 +178,11 @@ spec:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-conf.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-conf.yaml" . | include "helm-toolkit.utils.hash" }}
{{- $containers := (list "init" "ingress") }} {{- $containers := "init ingress" }}
{{- if and .Values.network.host_namespace .Values.network.vip.manage }} {{- if and .Values.network.host_namespace .Values.network.vip.manage }}
{{- $containers = append $containers "ingress-vip" }} {{- $containers = printf "%s ingress-vip-kernel-modules ingress-vip-init ingress-vip" $containers }}
{{- end }} {{- end }}
{{- $containers = splitList " " $containers }}
{{ dict "envAll" $envAll "podName" "ingress-server" "containerNames" $containers | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} {{ dict "envAll" $envAll "podName" "ingress-server" "containerNames" $containers | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}

2
ingress/values_overrides/apparmor.yaml
View File

@ -7,6 +7,8 @@ pod:
ingress-error-pages: runtime/default ingress-error-pages: runtime/default
ingress-server: ingress-server:
init: runtime/default init: runtime/default
ingress-vip-kernel-modules: runtime/default
ingress-vip-init: runtime/default
ingress: runtime/default ingress: runtime/default
ingress-vip: runtime/default ingress-vip: runtime/default
... ...