Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions valkey/templates/deploy_valkey.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ spec:
priorityClassName: {{ .Values.priorityClassName | quote }}
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
initContainers:
- name: {{ include "valkey.fullname" . }}-init
image: {{ include "valkey.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- omit . "enabled" | toYaml | nindent 12 }}
{{- end }}
command: [ "/scripts/init.sh" ]
volumeMounts:
Expand Down Expand Up @@ -104,7 +104,7 @@ spec:
command: [ "valkey-server" ]
args: [ "/data/conf/valkey.conf" ]
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
{{- omit .Values.securityContext "enabled" | toYaml | nindent 12 }}
env:
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
Expand Down Expand Up @@ -163,7 +163,7 @@ spec:
imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy | quote }}
{{- with .Values.metrics.exporter.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- omit . "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- with .Values.metrics.exporter.command }}
command:
Expand Down
8 changes: 4 additions & 4 deletions valkey/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ spec:
priorityClassName: {{ .Values.priorityClassName | quote }}
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
initContainers:
- name: {{ include "valkey.fullname" . }}-init
image: {{ include "valkey.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- omit . "enabled" | toYaml | nindent 12 }}
{{- end }}
command: [ "/scripts/init.sh" ]
env:
Expand Down Expand Up @@ -117,7 +117,7 @@ spec:
command: [ "valkey-server" ]
args: [ "/data/conf/valkey.conf" ]
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
{{- omit .Values.securityContext "enabled" | toYaml | nindent 12 }}
env:
- name: POD_INDEX
valueFrom:
Expand Down Expand Up @@ -177,7 +177,7 @@ spec:
imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy | quote }}
{{- with .Values.metrics.exporter.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- omit . "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- with .Values.metrics.exporter.command }}
command:
Expand Down
73 changes: 73 additions & 0 deletions valkey/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -428,3 +428,76 @@ tests:
secretKeyRef:
name: my-custom-secret
key: my-password-key

- it: should not render enabled key in podSecurityContext
set:
podSecurityContext:
enabled: true
fsGroup: 1000
runAsUser: 1000
template: templates/deploy_valkey.yaml
asserts:
- isKind:
of: Deployment
- notExists:
path: spec.template.spec.securityContext.enabled
- equal:
path: spec.template.spec.securityContext.fsGroup
value: 1000
- equal:
path: spec.template.spec.securityContext.runAsUser
value: 1000

- it: should not render enabled key in container securityContext
set:
securityContext:
enabled: true
runAsNonRoot: true
readOnlyRootFilesystem: true
template: templates/deploy_valkey.yaml
asserts:
- isKind:
of: Deployment
- notExists:
path: spec.template.spec.containers[0].securityContext.enabled
- equal:
path: spec.template.spec.containers[0].securityContext.runAsNonRoot
value: true
- equal:
path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
value: true

- it: should not render enabled key in init container securityContext
set:
securityContext:
enabled: true
allowPrivilegeEscalation: false
template: templates/deploy_valkey.yaml
asserts:
- isKind:
of: Deployment
- notExists:
path: spec.template.spec.initContainers[0].securityContext.enabled
- equal:
path: spec.template.spec.initContainers[0].securityContext.allowPrivilegeEscalation
value: false

- it: should not render enabled key in metrics exporter securityContext
set:
metrics.enabled: true
metrics.exporter.securityContext:
enabled: true
runAsNonRoot: true
runAsUser: 1000
template: templates/deploy_valkey.yaml
asserts:
- isKind:
of: Deployment
- notExists:
path: spec.template.spec.containers[1].securityContext.enabled
- equal:
path: spec.template.spec.containers[1].securityContext.runAsNonRoot
value: true
- equal:
path: spec.template.spec.containers[1].securityContext.runAsUser
value: 1000
81 changes: 81 additions & 0 deletions valkey/tests/statefulset_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,84 @@ tests:
secretKeyRef:
name: my-custom-secret
key: my-password-key

- it: should not render enabled key in podSecurityContext
set:
replica.enabled: true
replica.persistence.size: "5Gi"
podSecurityContext:
enabled: true
fsGroup: 1000
runAsUser: 1000
template: templates/statefulset.yaml
asserts:
- isKind:
of: StatefulSet
- notExists:
path: spec.template.spec.securityContext.enabled
- equal:
path: spec.template.spec.securityContext.fsGroup
value: 1000
- equal:
path: spec.template.spec.securityContext.runAsUser
value: 1000

- it: should not render enabled key in container securityContext
set:
replica.enabled: true
replica.persistence.size: "5Gi"
securityContext:
enabled: true
runAsNonRoot: true
readOnlyRootFilesystem: true
template: templates/statefulset.yaml
asserts:
- isKind:
of: StatefulSet
- notExists:
path: spec.template.spec.containers[0].securityContext.enabled
- equal:
path: spec.template.spec.containers[0].securityContext.runAsNonRoot
value: true
- equal:
path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
value: true

- it: should not render enabled key in init container securityContext
set:
replica.enabled: true
replica.persistence.size: "5Gi"
securityContext:
enabled: true
allowPrivilegeEscalation: false
template: templates/statefulset.yaml
asserts:
- isKind:
of: StatefulSet
- notExists:
path: spec.template.spec.initContainers[0].securityContext.enabled
- equal:
path: spec.template.spec.initContainers[0].securityContext.allowPrivilegeEscalation
value: false

- it: should not render enabled key in metrics exporter securityContext
set:
replica.enabled: true
replica.persistence.size: "5Gi"
metrics.enabled: true
metrics.exporter.securityContext:
enabled: true
runAsNonRoot: true
runAsUser: 1000
template: templates/statefulset.yaml
asserts:
- isKind:
of: StatefulSet
- notExists:
path: spec.template.spec.containers[1].securityContext.enabled
- equal:
path: spec.template.spec.containers[1].securityContext.runAsNonRoot
value: true
- equal:
path: spec.template.spec.containers[1].securityContext.runAsUser
value: 1000
Loading