Improve all charts to support service annotations #771 (#777)

charts/graylog/Chart.lock

 dependencies:
 - name: mongodb
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.3.5
+  version: 0.3.6
 - name: elasticsearch
   repository: https://groundhog2k.github.io/helm-charts
-  version: 0.1.103
-digest: sha256:e423c5b6c764e813bbc25113e4009cd57e1d927d22de0302264bee187d7c2de8
-generated: "2021-10-17T11:41:49.2311762+02:00"
+  version: 0.1.104
+digest: sha256:4849ddb07c1d1eba706fc87c41828d790c73d352db5458174f01b6870e249ba4
+generated: "2022-01-06T16:37:39.24843668+01:00"

charts/graylog/Chart.yaml

@@ -7,16 +7,16 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.3.5
+version: 0.3.6
 
 appVersion: "4.2.4-jre11"
 
 dependencies:
   - name: mongodb
-    version: 0.3.5
+    version: 0.3.6
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: mongodb.enabled
   - name: elasticsearch
-    version: 0.1.103
+    version: 0.1.104
     repository: "https://groundhog2k.github.io/helm-charts"
     condition: elasticsearch.enabled

charts/graylog/README.md

 # Graylog
 
-![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.2.4](https://img.shields.io/badge/AppVersion-4.2.4-informational?style=flat-square)
+![Version: 0.3.6](https://img.shields.io/badge/Version-0.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.2.4](https://img.shields.io/badge/AppVersion-4.2.4-informational?style=flat-square)
 
 A Helm chart for Graylog on Kubernetes
 
@@ -41,8 +41,8 @@ $ helm uninstall my-release
 
 | Repository | Name | Version |
 |------------|------|---------|
-| @groundhog2k | mongodb | 0.3.5 |
-| @groundhog2k | elasticsearch | 0.1.103 |
+| @groundhog2k | mongodb | 0.3.6 |
+| @groundhog2k | elasticsearch | 0.1.104 |
 
 ## Common parameters
 
@@ -95,6 +95,7 @@ $ helm uninstall my-release
 | service.nodePort | int | `nil` | The http 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 |
 
 ## Extra service parameters
 
@@ -110,7 +111,7 @@ Section to define all additional UDP/TCP inputs for Graylog
 | extraServices[].nodePort | int | `nil` | The http 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 |
 
 ## Ingress parameters
 

charts/graylog/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:

charts/graylog/templates/service.yaml

@@ -4,6 +4,10 @@ metadata:
   name: {{ include "graylog.fullname" . }}
   labels:
     {{- include "graylog.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/graylog/values.yaml

@@ -61,6 +61,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 ## List of extra service ports
 extraServices: {}
@@ -79,6 +81,8 @@ extraServices: {}
 #    clusterIP:
     ## The loadbalancer ip address (only relevant for type LoadBalancer)
 #    loadBalancerIP:
+    ## Annotations to add to the service
+#    annotations: {}
 
 ## Ingress configuration
 ingress: