Skip to content

Commit 82b79d7

Browse files
reixdRainer 'rei' Schuth
andauthored
rabbitmq secret user name consistent (#35)
Co-authored-by: Rainer 'rei' Schuth <rainer.schuth@digital-results-international.com>
1 parent 3df7416 commit 82b79d7

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

charts/rabbitmq-cluster/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: v2
33
name: rabbitmq-cluster
44
description: Helm chart to define a RabbitMQ cluster via official rabbitmq.com CRDs (RabbitmqCluster).
55
type: application
6-
version: 2.2.2
6+
version: "2.3.0"
77
appVersion: "4.2-management"
88
kubeVersion: ">= 1.33.0-0"
99
home: https://www.rabbitmq.com/kubernetes/operator/operator-overview.html

charts/rabbitmq-cluster/templates/users.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{- if ($user.enabled | default true) }}
77
{{- $userName := $user.name | default $name }}
88
{{- $tags := $user.tags | default (list) }}
9-
{{- $secretName := $user.existingSecret | default (printf "%s-user-%s" $clusterRef $userName) }}
9+
{{- $secretName := $user.existingSecret | default (printf "%s-%s" $clusterRef $userName | include "com.klicktipp.slugify-string") }}
1010
---
1111
apiVersion: rabbitmq.com/v1beta1
1212
kind: User
@@ -40,11 +40,12 @@ stringData:
4040
{{- $permission := $user.permission | default (dict) }}
4141
{{- if $permission.enabled | default true }}
4242
{{- $vhost := coalesce $user.vhost $permission.vhost $defaultVhost }}
43+
{{- $permissionName := $permission.name | default (printf "%s-%s" $clusterRef $userName) | include "com.klicktipp.slugify-string" }}
4344
---
4445
apiVersion: rabbitmq.com/v1beta1
4546
kind: Permission
4647
metadata:
47-
name: {{ $permission.name | default (printf "%s-%s" $clusterRef $userName) | include "com.klicktipp.slugify-string" | quote }}
48+
name: {{ $permissionName | quote }}
4849
spec:
4950
vhost: {{ $vhost | quote }}
5051
userReference:

0 commit comments

Comments
 (0)