From 69636b95a843716e69f98b69dcf76d888342e758 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, 6 Jan 2022 15:48:13 +0100
Subject: [PATCH] Improve all charts to support service annotations (#772)
---
charts/elasticsearch/Chart.yaml | 2 +-
charts/elasticsearch/README.md | 3 ++-
charts/elasticsearch/templates/service.yaml | 6 +++++-
charts/elasticsearch/values.yaml | 2 ++
charts/mariadb/Chart.yaml | 2 +-
charts/mariadb/README.md | 3 ++-
charts/mariadb/templates/service.yaml | 4 ++++
charts/mariadb/values.yaml | 2 ++
charts/mongodb/Chart.yaml | 2 +-
charts/mongodb/README.md | 3 ++-
charts/mongodb/templates/service.yaml | 4 ++++
charts/mongodb/values.yaml | 2 ++
charts/postgres/Chart.yaml | 4 ++--
charts/postgres/README.md | 3 ++-
charts/postgres/templates/service.yaml | 4 ++++
charts/postgres/values.yaml | 2 ++
charts/rabbitmq/Chart.yaml | 4 ++--
charts/rabbitmq/README.md | 4 +++-
charts/rabbitmq/templates/extraservices.yaml | 4 ++++
charts/rabbitmq/templates/service.yaml | 4 ++++
charts/rabbitmq/values.yaml | 4 ++++
charts/redis/Chart.yaml | 2 +-
charts/redis/README.md | 3 ++-
charts/redis/templates/service.yaml | 4 ++++
charts/redis/values.yaml | 2 ++
25 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml
index 12166097..5efd0a2e 100644
--- a/charts/elasticsearch/Chart.yaml
+++ b/charts/elasticsearch/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.0.1
+version: 0.0.2
appVersion: 6.8.22
diff --git a/charts/elasticsearch/README.md b/charts/elasticsearch/README.md
index 9020de1d..89f6f532 100644
--- a/charts/elasticsearch/README.md
+++ b/charts/elasticsearch/README.md
@@ -1,6 +1,6 @@
# Elasticsearch
-  
+  
A Helm chart for Elasticsearch on Kubernetes
@@ -89,6 +89,7 @@ $ helm uninstall my-release
| service.transportNodePort | int | `nil` | The transport node port (only relevant for type LoadBalancer or NodePort) |
| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
## Ingress parameters
diff --git a/charts/elasticsearch/templates/service.yaml b/charts/elasticsearch/templates/service.yaml
index e20d14ba..a0ac0bf6 100644
--- a/charts/elasticsearch/templates/service.yaml
+++ b/charts/elasticsearch/templates/service.yaml
@@ -3,7 +3,11 @@ kind: Service
metadata:
name: {{ include "elasticsearch.fullname" . }}
labels:
- {{- include "elasticsearch.labels" . | nindent 4 }}
+ {{- include "elasticsearch.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
type: {{ .Values.service.type }}
ports:
diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
index 1c137cdc..6e7af261 100644
--- a/charts/elasticsearch/values.yaml
+++ b/charts/elasticsearch/values.yaml
@@ -51,6 +51,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
## Ingress configuration
ingress:
diff --git a/charts/mariadb/Chart.yaml b/charts/mariadb/Chart.yaml
index e4c32b7e..c646942b 100644
--- a/charts/mariadb/Chart.yaml
+++ b/charts/mariadb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.15
+version: 0.2.16
appVersion: "10.5.13"
diff --git a/charts/mariadb/README.md b/charts/mariadb/README.md
index 713ea2a5..9bf80e56 100644
--- a/charts/mariadb/README.md
+++ b/charts/mariadb/README.md
@@ -1,6 +1,6 @@
# MariaDB
-  
+  
A Helm chart for MariaDB on Kubernetes
@@ -82,6 +82,7 @@ $ helm uninstall my-release
| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
## Storage parameters
diff --git a/charts/mariadb/templates/service.yaml b/charts/mariadb/templates/service.yaml
index 69af1321..42c40cf2 100644
--- a/charts/mariadb/templates/service.yaml
+++ b/charts/mariadb/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
name: {{ include "mariadb.fullname" . }}
labels:
{{- include "mariadb.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
type: {{ .Values.service.type }}
ports:
diff --git a/charts/mariadb/values.yaml b/charts/mariadb/values.yaml
index a36f0c09..eee39795 100644
--- a/charts/mariadb/values.yaml
+++ b/charts/mariadb/values.yaml
@@ -57,6 +57,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
# Resource limits and requests
resources: {}
diff --git a/charts/mongodb/Chart.yaml b/charts/mongodb/Chart.yaml
index 4810a850..6c78b317 100644
--- a/charts/mongodb/Chart.yaml
+++ b/charts/mongodb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.3.5
+version: 0.3.6
appVersion: "4.4.10"
diff --git a/charts/mongodb/README.md b/charts/mongodb/README.md
index 90929d0f..586b3b81 100644
--- a/charts/mongodb/README.md
+++ b/charts/mongodb/README.md
@@ -1,6 +1,6 @@
# MongoDB
-  
+  
A Helm chart for MongoDB on Kubernetes
@@ -83,6 +83,7 @@ $ helm uninstall my-release
| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
## Storage parameters
diff --git a/charts/mongodb/templates/service.yaml b/charts/mongodb/templates/service.yaml
index 31357c0c..c76499d6 100644
--- a/charts/mongodb/templates/service.yaml
+++ b/charts/mongodb/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
name: {{ include "mongodb.fullname" . }}
labels:
{{- include "mongodb.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
type: {{ .Values.service.type }}
ports:
diff --git a/charts/mongodb/values.yaml b/charts/mongodb/values.yaml
index 91919943..90b4f0ef 100644
--- a/charts/mongodb/values.yaml
+++ b/charts/mongodb/values.yaml
@@ -52,6 +52,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
## Resource limits and requests
resources: {}
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index 93f3ba44..48704923 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.3.2
+version: 0.2.15
-appVersion: "14.1"
+appVersion: "13.5"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index 76bf5083..796f2942 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
# PostgreSQL
-  
+  
A Helm chart for PostgreSQL on Kubernetes
@@ -90,6 +90,7 @@ $ helm uninstall my-release
| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
## Storage parameters
diff --git a/charts/postgres/templates/service.yaml b/charts/postgres/templates/service.yaml
index d13b907f..40ac0468 100644
--- a/charts/postgres/templates/service.yaml
+++ b/charts/postgres/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
name: {{ include "postgres.fullname" . }}
labels:
{{- include "postgres.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
type: {{ .Values.service.type }}
ports:
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index 87f367f3..f1f499b4 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -54,6 +54,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
resources: {}
# limits:
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 9ce507b6..9e734fbe 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.4.5
+version: 0.3.11
-appVersion: "3.9.11"
+appVersion: "3.8.26"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 6614d887..b780d7f4 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
# RabbitMQ
-  
+  
A Helm chart for a RabbitMQ HA-cluster on Kubernetes
@@ -97,6 +97,7 @@ $ helm uninstall my-release
| service.mgmt.nodePort | int | `nil` | Service node port (only relevant for type LoadBalancer or NodePort) |
| 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 |
## Extra services parameters
@@ -112,6 +113,7 @@ Section to define custom services
| extraServices[].nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
| 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 |
## Storage parameters
diff --git a/charts/rabbitmq/templates/extraservices.yaml b/charts/rabbitmq/templates/extraservices.yaml
index b85bd9ff..f9919df1 100644
--- a/charts/rabbitmq/templates/extraservices.yaml
+++ b/charts/rabbitmq/templates/extraservices.yaml
@@ -8,6 +8,10 @@ metadata:
name: {{ $fullname }}-{{ $service.name }}
labels:
{{- $labels | nindent 4 }}
+ {{- with $service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
type: {{ $service.type }}
ports:
diff --git a/charts/rabbitmq/templates/service.yaml b/charts/rabbitmq/templates/service.yaml
index 9f3b7e65..a5991da2 100644
--- a/charts/rabbitmq/templates/service.yaml
+++ b/charts/rabbitmq/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
name: {{ include "rabbitmq.fullname" . }}
labels:
{{- include "rabbitmq.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
ports:
- port: {{ .Values.service.amqp.port }}
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index c37de6f7..96077fb6 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -70,6 +70,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
## Custom list of extra services
extraServices: []
@@ -88,6 +90,8 @@ extraServices: []
# clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer)
# loadBalancerIP:
+ ## Annotations to add to the service
+# annotations: {}
## Ingress configuration
ingress:
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index 564b25a7..169d125e 100644
--- a/charts/redis/Chart.yaml
+++ b/charts/redis/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
- name: groundhog2k
# This is the chart version
-version: 0.4.8
+version: 0.4.9
# This is the version number of the application being deployed.
appVersion: "6.2.6"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 578c5e4d..14133306 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
# Redis
-  
+  
A Helm chart for Redis on Kubernetes
@@ -122,6 +122,7 @@ $ helm uninstall my-release
| service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort - not available when haMode is enabled) |
| service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
| service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer - not available when haMode is enabled) |
+| service.annotations | object | `{}` | Additional service annotations |
## Storage parameters
diff --git a/charts/redis/templates/service.yaml b/charts/redis/templates/service.yaml
index 42adcc0d..ba83bc3c 100644
--- a/charts/redis/templates/service.yaml
+++ b/charts/redis/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
name: {{ include "redis.fullname" . }}
labels:
{{- include "redis.labels" . | nindent 4 }}
+ {{- with .Values.service.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
ports:
{{- if .Values.haMode.enabled }}
diff --git a/charts/redis/values.yaml b/charts/redis/values.yaml
index 985ccdce..57358728 100644
--- a/charts/redis/values.yaml
+++ b/charts/redis/values.yaml
@@ -61,6 +61,8 @@ service:
clusterIP:
## The loadbalancer ip address (only relevant for type LoadBalancer - not available when haMode is enabled)
loadBalancerIP:
+ # Annotations to add to the service
+ annotations: {}
## Resource limits and requests (for Redis)
resources: {}
--
GitLab