Skip to content
Merged
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
6 changes: 6 additions & 0 deletions helm/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@ data:
# absolute number because relative will be proprtional to the full machine
# memory.
vm_memory_high_watermark.absolute = 1600MB

# Logging
log.file = false
log.console = true
log.console.level = info
log.console.formatter = json
14 changes: 14 additions & 0 deletions helm/templates/statefulsets/rabbitmq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,20 @@ spec:
serviceAccountName: {{ include "datatracker.serviceAccountName.rabbitmq" . }}
securityContext:
{{- toYaml $podValues.podSecurityContext | nindent 8 }}
initContainers:
- name: init-rabbitmq
image: busybox:stable
command:
- "sh"
- "-c"
- "mkdir -p -m700 /mnt/rabbitmq && chown 100:101 /mnt/rabbitmq"
securityContext:
runAsNonRoot: false
runAsUser: 0
readOnlyRootFilesystem: true
volumeMounts:
- name: "rabbitmq-data"
mountPath: "/mnt"
containers:
- name: {{ .Chart.Name }}
securityContext:
Expand Down
39 changes: 22 additions & 17 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ rabbitmq:
repository: "ghcr.io/ietf-tools/datatracker-mq"
pullPolicy: IfNotPresent
tag: "3.12-alpine"

imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
Expand All @@ -419,9 +418,6 @@ rabbitmq:
podAnnotations: {}
podLabels: {}

podSecurityContext: {}
# fsGroup: 2000

replicaCount: 1

resources: {}
Expand All @@ -436,13 +432,18 @@ rabbitmq:
# cpu: 100m
# memory: 128Mi

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
podSecurityContext:
runAsNonRoot: true

securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
# rabbitmq image sets up uid/gid 100/101
runAsUser: 100
runAsGroup: 101

service:
type: ClusterIP
Expand Down Expand Up @@ -476,6 +477,9 @@ rabbitmq:
- name: "rabbitmq-config"
configMap:
name: "rabbitmq-configmap"
- name: "rabbitmq-tmp"
emptyDir:
sizeLimit: 50Mi
# - name: foo
# secret:
# secretName: mysecret
Expand All @@ -484,12 +488,12 @@ rabbitmq:
# Additional volumeMounts on the output Deployment definition.
volumeMounts:
- name: "rabbitmq-data"
mountPath: "/var/lib/rabbitmq/mnesia"
mountPath: "/var/lib/rabbitmq"
subPath: "rabbitmq"
- name: "rabbitmq-config"
mountPath: "/etc/rabbitmq"
# - name: foo
# mountPath: "/etc/foo"
# readOnly: true
- name: "rabbitmq-tmp"
mountPath: "/tmp"

tolerations: []

Expand Down Expand Up @@ -531,15 +535,16 @@ memcached:

podSecurityContext:
runAsNonRoot: true
runAsUser: 11211
runAsGroup: 11211

securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
# memcached image sets up uid/gid 11211
runAsUser: 11211
runAsGroup: 11211

service:
type: ClusterIP
Expand Down