Merge "Fix placement of privilege escalation in Glance."

This commit is contained in:
Zuul 2019-03-15 06:29:32 +00:00 committed by Gerrit Code Review
commit 1a5ecce63a
1 changed files with 2 additions and 2 deletions

View File

@ -71,8 +71,6 @@ spec:
{{ if eq .Values.storage "rbd" }}
- name: ceph-keyring-placement
{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
securityContext:
allowPrivilegeEscalation: false
env:
- name: RBD_STORE_USER
value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }}
@ -94,6 +92,8 @@ spec:
- name: glance-api
{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
allowPrivilegeEscalation: false
command:
- /tmp/glance-api.sh
- start