openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluent-logging securityContext"

Browse Source
This commit is contained in:
Zuul 2019-03-22 01:31:25 +00:00 committed by Gerrit Code Review
commit ce8a75afa5
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fluent-logging/templates/deployment-fluentd.yaml
View File

@ -95,8 +95,6 @@ spec:
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
spec: spec:
securityContext:
readOnlyRootFilesystem: true
{{ dict "envAll" $envAll "application" "fluentd" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "fluentd" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
affinity: affinity:
@ -110,8 +108,7 @@ spec:
- name: fluentd - name: fluentd
{{ tuple $envAll "fluentd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll "fluentd" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.fluentd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.fluentd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: {{ dict "envAll" $envAll "application" "fluentd" "container" "fluentd" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
allowPrivilegeEscalation: false
command: command:
- /tmp/fluentd.sh - /tmp/fluentd.sh
- start - start

3
fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -52,8 +52,7 @@ spec:
- name: fluentd-exporter - name: fluentd-exporter
{{ tuple $envAll "prometheus_fluentd_exporter" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll "prometheus_fluentd_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.prometheus_fluentd_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.prometheus_fluentd_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: {{ dict "envAll" $envAll "application" "fluentd_exporter" "container" "fluentd_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
allowPrivilegeEscalation: false
command: command:
- /tmp/fluentd-exporter.sh - /tmp/fluentd-exporter.sh
- start - start

14
fluent-logging/values.yaml
View File

@ -571,11 +571,19 @@ network:
port: 32329 port: 32329
pod: pod:
user: security_context:
fluentd: fluentd:
uid: 65534 pod:
runAsUser: 65534
container:
fluentd:
allowPrivilegeEscalation: false
fluentd_exporter: fluentd_exporter:
uid: 65534 pod:
runAsUser: 65534
container:
fluentd_exporter:
allowPrivilegeEscalation: false
affinity: affinity:
anti: anti:
type: type: