Skip to content

Commit 0d364d0

Browse files
authored
Feature/renovate fix (CloudPirates-io#256)
* [rabbitmq]: Fix auth disable erlang cookie * Bump chart version * Fix wrong chart bump * Shut up renovate --------- Signed-off-by: Finn Rades <64548817+zOnlyKroks@users.noreply.github.com>
1 parent b75cc0c commit 0d364d0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

charts/rabbitmq/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: rabbitmq
33
description: A messaging broker that implements the Advanced Message Queuing Protocol (AMQP)
44
type: application
5-
version: 0.3.1
5+
version: 0.3.2
66
appVersion: "4.1.4"
77
keywords:
88
- rabbitmq

charts/rabbitmq/templates/statefulset.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ spec:
2929
{{- end }}
3030
serviceAccountName: {{ include "rabbitmq.serviceAccountName" . }}
3131
securityContext: {{ include "common.renderPodSecurityContext" . | nindent 8 }}
32-
{{- if or .Values.auth.enabled .Values.installPlugins .Values.customScripts.initContainers }}
3332
initContainers:
34-
{{- if .Values.auth.enabled }}
3533
- name: init-erlang-cookie
3634
image: "{{ .Values.initContainer.image.registry | default .Values.global.imageRegistry }}/{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
3735
imagePullPolicy: "{{ .Values.initContainer.image.pullPolicy }}"
@@ -40,19 +38,25 @@ spec:
4038
- sh
4139
- -c
4240
- |
41+
{{- if .Values.auth.enabled }}
4342
echo "$RABBITMQ_ERLANG_COOKIE" > /var/lib/rabbitmq/.erlang.cookie
43+
{{- else }}
44+
# Generate a default Erlang cookie when auth is disabled
45+
echo "defaultcookie" > /var/lib/rabbitmq/.erlang.cookie
46+
{{- end }}
4447
chmod 400 /var/lib/rabbitmq/.erlang.cookie
4548
chown $(id -u):$(id -g) /var/lib/rabbitmq/.erlang.cookie
49+
{{- if .Values.auth.enabled }}
4650
env:
4751
- name: RABBITMQ_ERLANG_COOKIE
4852
valueFrom:
4953
secretKeyRef:
5054
name: {{ include "rabbitmq.secretName" . }}
5155
key: {{ include "rabbitmq.secretErlangCookieKey" . }}
56+
{{- end }}
5257
volumeMounts:
5358
- name: data
5459
mountPath: /var/lib/rabbitmq
55-
{{- end }}
5660
{{- if .Values.installPlugins }}
5761
- name: download-plugins
5862
image: "{{ .Values.initContainer.image.registry | default .Values.global.imageRegistry }}/{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
@@ -97,7 +101,6 @@ spec:
97101
{{- if .Values.customScripts.initContainers }}
98102
{{- toYaml .Values.customScripts.initContainers | nindent 8 }}
99103
{{- end }}
100-
{{- end }}
101104
containers:
102105
- name: {{ .Chart.Name }}
103106
securityContext: {{ include "common.renderContainerSecurityContext" . | nindent 12 }}

renovate.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@
5555
"commitMessagePrefix": "[helm]"
5656
},
5757
{
58+
"matchDatasources": [
59+
"docker"
60+
],
5861
"matchPackageNames": [
59-
"cloudpirates/clusterpirate"
62+
"koperator-internal/services/clusterpirate"
6063
],
6164
"enabled": false
6265
},

0 commit comments

Comments
 (0)