Rabbitmq: Fix security context
This PS fixes the use of the security context macros for the rabbitmq chart Change-Id: I91499757bd7af95132d0aee33a16d642e26439bb
This commit is contained in:
parent
010faee9d5
commit
7f20bcd938
@ -34,6 +34,7 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
{{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
|
{{ dict "envAll" $envAll "application" "cluster_wait" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
restartPolicy: OnFailure
|
restartPolicy: OnFailure
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
@ -43,6 +44,7 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: {{.Release.Name}}-rabbitmq-cluster-wait
|
- name: {{.Release.Name}}-rabbitmq-cluster-wait
|
||||||
{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "cluster_wait" "container" "rabbitmq_cluster_wait" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
env:
|
env:
|
||||||
- name: RABBITMQ_ADMIN_CONNECTION
|
- name: RABBITMQ_ADMIN_CONNECTION
|
||||||
value: {{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | quote }}
|
value: {{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | quote }}
|
||||||
|
@ -38,6 +38,7 @@ spec:
|
|||||||
{{ tuple $envAll "prometheus_rabbitmq_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
{{ tuple $envAll "prometheus_rabbitmq_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
||||||
namespace: {{ $envAll.Values.endpoints.prometheus_rabbitmq_exporter.namespace }}
|
namespace: {{ $envAll.Values.endpoints.prometheus_rabbitmq_exporter.namespace }}
|
||||||
spec:
|
spec:
|
||||||
|
{{ dict "envAll" $envAll "application" "exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||||
serviceAccountName: {{ $rcControllerName | quote }}
|
serviceAccountName: {{ $rcControllerName | quote }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ $envAll.Values.labels.prometheus_rabbitmq_exporter.node_selector_key }}: {{ $envAll.Values.labels.prometheus_rabbitmq_exporter.node_selector_value | quote }}
|
{{ $envAll.Values.labels.prometheus_rabbitmq_exporter.node_selector_key }}: {{ $envAll.Values.labels.prometheus_rabbitmq_exporter.node_selector_value | quote }}
|
||||||
@ -48,6 +49,7 @@ spec:
|
|||||||
- name: rabbitmq-exporter
|
- name: rabbitmq-exporter
|
||||||
{{ tuple $envAll "prometheus_rabbitmq_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "prometheus_rabbitmq_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.prometheus_rabbitmq_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.prometheus_rabbitmq_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "exporter" "container" "rabbitmq_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
ports:
|
ports:
|
||||||
- name: metrics
|
- name: metrics
|
||||||
containerPort: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port }}
|
containerPort: {{ $envAll.Values.network.prometheus_rabbitmq_exporter.port }}
|
||||||
|
@ -36,6 +36,7 @@ metadata:
|
|||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
||||||
"helm.sh/hook": test-success
|
"helm.sh/hook": test-success
|
||||||
spec:
|
spec:
|
||||||
|
{{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ $envAll.Values.labels.test.node_selector_key }}: {{ $envAll.Values.labels.test.node_selector_value | quote }}
|
{{ $envAll.Values.labels.test.node_selector_key }}: {{ $envAll.Values.labels.test.node_selector_value | quote }}
|
||||||
@ -45,6 +46,7 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: {{.Release.Name}}-rabbitmq-test
|
- name: {{.Release.Name}}-rabbitmq-test
|
||||||
{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
|
{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "test" "container" "rabbitmq_test" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
|
||||||
env:
|
env:
|
||||||
- name: RABBITMQ_ADMIN_CONNECTION
|
- name: RABBITMQ_ADMIN_CONNECTION
|
||||||
value: {{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | quote }}
|
value: {{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | quote }}
|
||||||
|
@ -82,8 +82,7 @@ spec:
|
|||||||
secret-rabbit-admin-hash: {{ tuple "secret-rabbit-admin.yaml" . | include "helm-toolkit.utils.hash" }}
|
secret-rabbit-admin-hash: {{ tuple "secret-rabbit-admin.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
secret-erlang-cookie-hash: {{ tuple "secret-erlang-cookie.yaml" . | include "helm-toolkit.utils.hash" }}
|
secret-erlang-cookie-hash: {{ tuple "secret-erlang-cookie.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||||
readOnlyRootFilesystem: true
|
|
||||||
serviceAccountName: {{ $rcControllerName | quote }}
|
serviceAccountName: {{ $rcControllerName | quote }}
|
||||||
affinity:
|
affinity:
|
||||||
{{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
{{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
||||||
@ -93,9 +92,8 @@ spec:
|
|||||||
{{ tuple $envAll "rabbitmq" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll "rabbitmq" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
- name: rabbitmq-password
|
- name: rabbitmq-password
|
||||||
{{ tuple $envAll "rabbitmq_init" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "rabbitmq_init" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
securityContext:
|
|
||||||
runAsUser: 0
|
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "server" "container" "rabbitmq_password" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
command:
|
command:
|
||||||
- /tmp/rabbitmq-password-hash.py
|
- /tmp/rabbitmq-password-hash.py
|
||||||
env:
|
env:
|
||||||
@ -122,9 +120,8 @@ spec:
|
|||||||
readOnly: true
|
readOnly: true
|
||||||
- name: rabbitmq-cookie
|
- name: rabbitmq-cookie
|
||||||
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
securityContext:
|
|
||||||
runAsUser: 0
|
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "server" "container" "rabbitmq_cookie" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
command:
|
command:
|
||||||
- /tmp/rabbitmq-cookie.sh
|
- /tmp/rabbitmq-cookie.sh
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
@ -143,9 +140,8 @@ spec:
|
|||||||
{{- if $envAll.Values.volume.chown_on_start }}
|
{{- if $envAll.Values.volume.chown_on_start }}
|
||||||
- name: rabbitmq-perms
|
- name: rabbitmq-perms
|
||||||
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
securityContext:
|
|
||||||
runAsUser: 0
|
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "server" "container" "rabbitmq_perms" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
command:
|
command:
|
||||||
- chown
|
- chown
|
||||||
- -R
|
- -R
|
||||||
@ -161,6 +157,7 @@ spec:
|
|||||||
- name: rabbitmq
|
- name: rabbitmq
|
||||||
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
|
{{ dict "envAll" $envAll "application" "server" "container" "rabbitmq" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
command:
|
command:
|
||||||
- /tmp/rabbitmq-start.sh
|
- /tmp/rabbitmq-start.sh
|
||||||
ports:
|
ports:
|
||||||
|
@ -48,6 +48,38 @@ images:
|
|||||||
- image_repo_sync
|
- image_repo_sync
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
|
security_context:
|
||||||
|
exporter:
|
||||||
|
pod:
|
||||||
|
runAsUser: 65534
|
||||||
|
container:
|
||||||
|
rabbitmq_exporter:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
allowPrivilegeEscalation: false
|
||||||
|
server:
|
||||||
|
pod:
|
||||||
|
runAsUser: 0
|
||||||
|
container:
|
||||||
|
rabbitmq_password:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
rabbitmq_cookie:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
rabbitmq_perms:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
rabbitmq:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
cluster_wait:
|
||||||
|
pod:
|
||||||
|
runAsUser: 0
|
||||||
|
container:
|
||||||
|
rabbitmq_cluster_wait:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
|
test:
|
||||||
|
pod:
|
||||||
|
runAsUser: 0
|
||||||
|
container:
|
||||||
|
rabbitmq_test:
|
||||||
|
readOnlyRootFilesystem: false
|
||||||
affinity:
|
affinity:
|
||||||
anti:
|
anti:
|
||||||
type:
|
type:
|
||||||
|
Loading…
Reference in New Issue
Block a user