From 46c8f4b24b4f44ddc522d3814fcd44a3b7bbd6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20P=C3=B6hner?=
<10630407+groundhog2k@users.noreply.github.com>
Date: Thu, 9 Nov 2023 14:21:16 +0100
Subject: [PATCH] Add statefulset annotations to rabbitmq (#1265)
---
charts/rabbitmq/Chart.yaml | 4 ++--
charts/rabbitmq/README.md | 2 ++
charts/rabbitmq/RELEASENOTES.md | 1 +
charts/rabbitmq/templates/statefulset.yaml | 7 +++++++
charts/rabbitmq/values.yaml | 6 ++++++
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index cae091a0..87fbc768 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: "0.7.8"
+version: "0.6.30"
-appVersion: "3.12.8"
+appVersion: "3.11.25"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 6cfb384f..236eb9ff 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -76,6 +76,8 @@ helm uninstall my-release
| initResources | object | `{}` | Resource limits and requests for the default init container |
| resources | object | `{}` | Resource limits and requests |
| nodeSelector | object | `{}` | Deployment node selector |
+| statefulsetLabels | object | `{}` | Additional StatefulSet labels |
+| statefulsetAnnotations | object | `{}` | Additional StatefulSet annotations |
| podAnnotations | object | `{}` | Additional pod annotations |
| podSecurityContext | object | `see values.yaml` | Pod security context |
| securityContext | object | `see values.yaml` | Container security context |
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 7ba3e2fa..2d120d52 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -90,6 +90,7 @@
| 0.6.27 | 3.11.23 | Upgraded to RabbitMQ 3.11.23 |
| 0.6.28 | 3.11.24 | Upgraded to RabbitMQ 3.11.24 |
| 0.6.29 | 3.11.25 | Upgraded to RabbitMQ 3.11.25 |
+| 0.6.30 | 3.11.25 | Upgraded to RabbitMQ 3.11.25 |
| 0.7.0 | 3.12.0 | Upgraded to RabbitMQ 3.12.0 |
| 0.7.1 | 3.12.1 | Upgraded to RabbitMQ 3.12.1 |
| 0.7.2 | 3.12.2 | Upgraded to RabbitMQ 3.12.2 |
diff --git a/charts/rabbitmq/templates/statefulset.yaml b/charts/rabbitmq/templates/statefulset.yaml
index a1e49be3..cf25bf23 100644
--- a/charts/rabbitmq/templates/statefulset.yaml
+++ b/charts/rabbitmq/templates/statefulset.yaml
@@ -4,6 +4,13 @@ metadata:
name: {{ include "rabbitmq.fullname" . }}
labels:
{{- include "rabbitmq.labels" . | nindent 4 }}
+ {{- with .Values.statefulsetLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+ {{- with .Values.statefulsetAnnotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
selector:
matchLabels:
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index d9fe53fc..85759ac3 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -23,6 +23,12 @@ fullnameOverride: ""
## Number of replicas
replicaCount: 1
+## Additional statefulset labels
+statefulsetLabels: {}
+
+## Additional statefulset annotations
+statefulsetAnnotations: {}
+
## Additional pod annotations
podAnnotations: {}
--
GitLab