diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml index df6b50113c3ed110f229e166a09091e71c80e8e8..989ce64a83716a02bd4cd600af0ca90a007609e7 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 cddfe56e5c8ba88d500b78dd4c813ee4dc4a3671..2c5664a84aba2b7c79ef240e68c8e207f0cafbb2 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 4332822c7fdaebc3572269b3d58675e273d04774..ee1a865a41aa56beb5581343c9ab4c2ea6a4fd8d 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 f9919df100de95d2508952aa58498a9e48299729..137e2d3bfb3cae99ca3cffc88ddd1c9bf8d6fa2e 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 a5991da2aa9e619edc3a1b91914474019a47d37f..e321bef7d40edae7a0180d35026c858856e52d8f 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 85759ac3f15f2e8977447558c0a5044ecfc01835..9d1b6c6b58c51ae87178d5ae9a59002ffc161248 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