openstack/openstack-helm-infra
Code Issues Proposed changes

Don't try to apply k8s acl control to non existent container

Browse Source 
Change-Id: Iff8dee23cad5e1846135456df66d52b8aa3b19a2
This commit is contained in:
Andrii Ostapenko 2020-05-18 10:03:10 -05:00
parent 99c09daa74
commit 82c6ceaf18
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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