From e4fa5522b282b420b5c74fa96953626dc76e3c52 Mon Sep 17 00:00:00 2001
From: m4r1u2 <37156811+m4r1u2@users.noreply.github.com>
Date: Thu, 28 Dec 2023 19:49:21 +0100
Subject: [PATCH] rabbitmq - set additional service lables (#1306)
* rabbitmq - set additional service lables
* Increased version and added extraService labels
---------
Co-authored-by: Marius Ensrud <marius.ensrud@skatteetaten.no>
Co-authored-by: Goeran Poehner <goeran.poehner@gmail.com>
---
charts/rabbitmq/Chart.yaml | 2 +-
charts/rabbitmq/README.md | 2 ++
charts/rabbitmq/RELEASENOTES.md | 1 +
charts/rabbitmq/templates/extraservices.yaml | 3 +++
charts/rabbitmq/templates/service.yaml | 3 +++
charts/rabbitmq/values.yaml | 6 +++++-
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index df6b5011..989ce64a 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: "0.6.33"
+version: "0.6.34"
appVersion: "3.11.28"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index cddfe56e..2c5664a8 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -114,6 +114,7 @@ helm uninstall my-release
| service.prometheus.port | int | `15692` | Prometheus service port |
| service.prometheus.nodePort | int | `nil` | Service node port (only relevant for type LoadBalancer or NodePort) |
| service.annotations | object | `{}` | Additional service annotations |
+| service.labels | object | `{}` | Additional service labels |
## Extra services parameters
@@ -130,6 +131,7 @@ Section to define custom services
| extraServices[].clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| extraServices[].loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
| extraServices[].annotations | object | `{}` | Additional service annotations |
+| extraServices[].labels | object | `{}` | Additional service labels |
## Service monitor parameters
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 4332822c..ee1a865a 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -94,6 +94,7 @@
| 0.6.31 | 3.11.26 | Upgraded to RabbitMQ 3.11.26 |
| 0.6.32 | 3.11.27 | Upgraded to RabbitMQ 3.11.27 |
| 0.6.33 | 3.11.28 | Upgraded to RabbitMQ 3.11.28 |
+| 0.6.34 | 3.11.28 | Added additional service labels - thx @m4r1u2 |
| 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/extraservices.yaml b/charts/rabbitmq/templates/extraservices.yaml
index f9919df1..137e2d3b 100644
--- a/charts/rabbitmq/templates/extraservices.yaml
+++ b/charts/rabbitmq/templates/extraservices.yaml
@@ -8,6 +8,9 @@ metadata:
name: {{ $fullname }}-{{ $service.name }}
labels:
{{- $labels | nindent 4 }}
+ {{- with $service.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- with $service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
diff --git a/charts/rabbitmq/templates/service.yaml b/charts/rabbitmq/templates/service.yaml
index a5991da2..e321bef7 100644
--- a/charts/rabbitmq/templates/service.yaml
+++ b/charts/rabbitmq/templates/service.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ include "rabbitmq.fullname" . }}
labels:
{{- include "rabbitmq.labels" . | nindent 4 }}
+ {{- with .Values.service.labels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index 85759ac3..9d1b6c6b 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -83,8 +83,10 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
- # Annotations to add to the service
+ ## Annotations to add to the service
annotations: {}
+ ## Labels to add to the service
+ labels: {}
## Custom list of extra services
extraServices: []
@@ -105,6 +107,8 @@ extraServices: []
# loadBalancerIP:
## Annotations to add to the service
# annotations: {}
+ ## Labels to add to the service
+# labels: {}
## Service monitor configuration for Prometheus metrics
## Prometheus plugin must be enabled to use this
--
GitLab