Skip to content

Commit d0a17f5

Browse files
committed
[rabbitmq] Add credential-updater sidecar
- Add [user-credential-updater](https://github.com/sapcc/rabbitmq-user-credential-updater) sidecar container - Use sidecar container for runtime password updates - Chart version bumped
1 parent 40d1e5f commit d0a17f5

File tree

7 files changed

+42
-5
lines changed

7 files changed

+42
-5
lines changed

Diff for: common/rabbitmq/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
This file is used to list changes made in each version of the common chart rabbitmq.
44

5+
## 0.16.0
6+
7+
- Add [user-credential-updater](https://github.com/sapcc/rabbitmq-user-credential-updater) sidecar container
8+
- Use sidecar container for runtime password updates
9+
- Chart version bumped
10+
511
## 0.15.0
612

713
- Remove the following helm template helper functions:
@@ -49,6 +55,7 @@ The default is a `ClusterIssuer`, but it can be changed with the respective valu
4955
It is imporant there, that all names entered are accepted by the certificate-issuer.
5056

5157
## 0.12.1
58+
5259
- `app` selector label returned, because deployment selector is immutable
5360
- chart version bumped
5461

Diff for: common/rabbitmq/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v1
33
name: rabbitmq
4-
version: 0.15.0
4+
version: 0.16.0
55
appVersion: 4.0.6
66
description: A Helm chart for RabbitMQ
77
sources:

Diff for: common/rabbitmq/ci/test-values.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
---
12
# Test values for rabbitmq.
2-
33
global:
44
user_suffix: ""
55
master_password: ""
6-
dockerHubMirrorAlternateRegion: "other.dockerhub.mirror"
6+
registry: my.docker.registry
7+
registryAlternateRegion: other.docker.registry
8+
dockerHubMirror: my.dockerhub.mirror
9+
dockerHubMirrorAlternateRegion: other.dockerhub.mirro
710
region: "region"
811
tld: "tld"
912

Diff for: common/rabbitmq/templates/_helpers.tpl

+8
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
4747
{{- end -}}
4848
{{- end -}}
4949

50+
{{- define "dockerRegistry" -}}
51+
{{- if .Values.use_alternate_registry -}}
52+
{{- .Values.global.registryAlternateRegion -}}
53+
{{- else -}}
54+
{{- .Values.global.registry -}}
55+
{{- end -}}
56+
{{- end -}}
57+
5058
{{- define "rabbitmq_maintenance_affinity" }}
5159
- weight: 1
5260
preference:

Diff for: common/rabbitmq/templates/deployment.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ spec:
2525
annotations:
2626
kubectl.kubernetes.io/default-container: rabbitmq
2727
checksum/container.init: {{ include (print $.Template.BasePath "/bin-configmap.yaml") . | sha256sum }}
28-
checksum/users: {{ include (print $.Template.BasePath "/users-secret.yaml") . | sha256sum }}
2928
{{- if and (and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested) $.Values.linkerd.enabled }}
3029
linkerd.io/inject: enabled
3130
config.linkerd.io/opaque-ports: "{{ default 5672 .Values.ports.public }}"
@@ -136,6 +135,14 @@ spec:
136135
- mountPath: /etc/rabbitmq/ssl
137136
name: ssl
138137
{{- end }}
138+
- name: user-credential-updater
139+
image: "{{ include "dockerRegistry" . }}/{{ .Values.credentialUpdater.image }}:{{.Values.credentialUpdater.imageTag }}"
140+
imagePullPolicy: {{ default "IfNotPresent" .Values.imagePullPolicy | quote }}
141+
volumeMounts:
142+
- mountPath: /etc/rabbitmq/secrets
143+
name: rabbitmq-users-config
144+
- mountPath: /var/lib/rabbitmq
145+
name: rabbitmq-persistent-storage
139146
priorityClassName: {{ .Values.priority_class | default "critical-infrastructure" | quote }}
140147
volumes:
141148
- name: rabbitmq-persistent-storage

Diff for: common/rabbitmq/templates/statefulset.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ spec:
2323
config.linkerd.io/opaque-ports: "{{ default 5672 .Values.ports.public }}"
2424
{{- end }}
2525
checksum/container.init: {{ include (print $.Template.BasePath "/bin-configmap.yaml") . | sha256sum }}
26-
checksum/users: {{ include (print $.Template.BasePath "/users-secret.yaml") . | sha256sum }}
2726
{{- if .Values.customConfig }}
2827
checksum/custom.conf: {{ include (print .Template.BasePath "/etc/_rabbitmq-custom-config.tpl") . | sha256sum }}
2928
{{- end }}
@@ -128,6 +127,14 @@ spec:
128127
- mountPath: /etc/rabbitmq/ssl
129128
name: ssl
130129
{{- end }}
130+
- name: user-credential-updater
131+
image: "{{ include "dockerRegistry" . }}/{{ .Values.credentialUpdater.image }}:{{.Values.credentialUpdater.imageTag }}"
132+
imagePullPolicy: {{ default "IfNotPresent" .Values.imagePullPolicy | quote }}
133+
volumeMounts:
134+
- mountPath: /etc/rabbitmq/secrets
135+
name: rabbitmq-users-config
136+
- mountPath: /var/lib/rabbitmq
137+
name: rabbitmq-persistent-storage
131138
priorityClassName: {{ .Values.priority_class | default "critical-infrastructure" | quote }}
132139
volumes:
133140
{{- if not .Values.persistence.enabled }}

Diff for: common/rabbitmq/values.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ customConfig: {}
123123
# if not set default value of 50MB will be used
124124
# disk_free_limit.absolute: 500MB
125125

126+
credentialUpdater:
127+
enabled: true
128+
image: rabbitmq-user-credential-updater
129+
imageTag: '20250218131234'
130+
126131
enableSsl: false
127132
certificate:
128133
issuerRef:

0 commit comments

Comments
 (0)