Merge "Updating promethious alertmanager container name to make it consistent"

This commit is contained in:
Zuul 2020-08-25 14:12:05 +00:00 committed by Gerrit Code Review
commit 3e582c8aa6
2 changed files with 4 additions and 4 deletions

View File

@ -58,7 +58,7 @@ spec:
- name: prometheus-alertmanager-perms
{{ tuple $envAll "prometheus-alertmanager" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "server" "container" "alertmanager_perms" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
{{ dict "envAll" $envAll "application" "server" "container" "prometheus_alertmanager_perms" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
command:
- chown
- -R
@ -73,7 +73,7 @@ spec:
- name: prometheus-alertmanager
{{ tuple $envAll "prometheus-alertmanager" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "server" "container" "alertmanager" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
{{ dict "envAll" $envAll "application" "server" "container" "prometheus_alertmanager" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
command:
- /tmp/alertmanager.sh
- start

View File

@ -46,10 +46,10 @@ pod:
pod:
runAsUser: 65534
container:
alertmanager_perms:
prometheus_alertmanager_perms:
runAsUser: 0
readOnlyRootFilesystem: true
alertmanager:
prometheus_alertmanager:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
affinity: