Add the possability to add annotations to the service (#19)

charts/frank-console/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: frank-console
 description: The Frank!Framework console is a web application that allows you to manage multiple instances of Frank!Framework from a single console.
-version: 0.1.2
+version: 0.1.3
 appVersion: "8.3.0-SNAPSHOT"
 type: application
 home: https://frankframework.org

charts/frank-console/README.md

@@ -107,6 +107,7 @@ The readiness probe will check if all adapters are running using the server heal
 | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- | ----------- |
 | `service.type`                 | frank-console service type                                                                                                       | `ClusterIP` |
 | `service.port`                 | frank-console service port                                                                                                       | `80`        |
+| `service.annotations`          | Additional annotations for the frank-console service                                                                             | `{}`        |
 | `ingress.enabled`              | Enable ingress record generation for Frank!                                                                                      | `false`     |
 | `ingress.className`            | IngressClass that will be used to implement the Ingress (Kubernetes 1.18+)                                                       | `""`        |
 | `ingress.annotations`          | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}`        |

charts/frank-console/templates/service.yaml

@@ -1,6 +1,13 @@
 apiVersion: v1
 kind: Service
-{{ template "frank-console.metadata" . }}
+metadata:
+  name: {{ include "frank-console.fullname" . }}
+  labels:
+    {{- include "frank-console.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/frank-console/values.schema.json

@@ -204,6 +204,11 @@
                     "type": "number",
                     "description": "frank-console service port",
                     "default": 80
+                },
+                "annotations": {
+                    "type": "object",
+                    "description": "Additional annotations for the frank-console service",
+                    "default": {}
                 }
             }
         },

charts/frank-console/values.yaml

@@ -194,6 +194,9 @@ service:
   type: ClusterIP
   ## @param service.port frank-console service port
   port: 80
+  ## @param service.annotations Additional annotations for the frank-console service
+  ##
+  annotations: {}
 
 ## Configure the ingress resource that allows you to access the frank-console installation
 ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/

charts/frank2example/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: frankframework
   repository: file://../frankframework
-  version: 0.3.2
-digest: sha256:9964b433c6ea25a6976356e24ec445af22a9dc4916ecaa1773bbab597ea07b95
-generated: "2024-09-02T11:04:56.2688498+02:00"
+  version: 0.3.3
+digest: sha256:20c44a5703890fffd2b7438d64c9baa9193fd919fe486d60c9a42da99effc64a
+generated: "2024-09-03T11:06:52.7800751+02:00"

charts/frank2example/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: frank2example
 description: A Helm chart for running Frank2Example on Kubernetes
-version: 0.3.1
+version: 0.3.2
 type: application
 home: https://frankframework.org
 icon: https://raw.githubusercontent.com/frankframework/charts/master/charts/frank2example/icon.svg
@@ -11,5 +11,5 @@ keywords:
 
 dependencies:
   - name: frankframework
-    version: 0.3.2
+    version: 0.3.3
     repository: file://../frankframework

charts/frankframework/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: frank-console
   repository: file://../frank-console
-  version: 0.1.2
-digest: sha256:71e05fa89823edb1505aef27bb1fad3f6da958ab382b06f778508162cda968a1
-generated: "2024-09-02T11:04:53.2461361+02:00"
+  version: 0.1.3
+digest: sha256:d6e896b77100a4613cbfedae57528a9d4118b7f7dade1349f426474b49d446b8
+generated: "2024-09-03T11:06:56.6348991+02:00"

charts/frankframework/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: frankframework
 description: A Helm chart for running the Frank!Framework on Kubernetes
-version: 0.3.2
+version: 0.3.3
 appVersion: "8.3.0-SNAPSHOT"
 type: application
 home: https://frankframework.org
@@ -15,7 +15,7 @@ keywords:
 
 dependencies:
   - name: frank-console
-    version: 0.1.2
+    version: 0.1.3
     alias: console
     condition: console.enabled
     repository: file://../frank-console

charts/frankframework/README.md

@@ -155,6 +155,7 @@ The readiness probe will check if all adapters are running using the server heal
 | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- | ----------- |
 | `service.type`                 | Frank!Framework service type                                                                                                     | `ClusterIP` |
 | `service.port`                 | Frank!Framework service port                                                                                                     | `80`        |
+| `service.annotations`          | Additional annotations for the Frank!Framework service                                                                           | `{}`        |
 | `ingress.enabled`              | Enable ingress record generation for Frank!                                                                                      | `false`     |
 | `ingress.className`            | IngressClass that will be used to implement the Ingress (Kubernetes 1.18+)                                                       | `""`        |
 | `ingress.annotations`          | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}`        |

charts/frankframework/templates/persistentvolumeclaim.yaml

@@ -5,9 +5,9 @@ metadata:
   name: {{ template "frankframework.fullname" . }}-data
   labels:
     {{- include "frankframework.labels" . | nindent 4 }}
-  {{- if .Values.persistence.annotations }}
+  {{- with .Values.persistence.annotations  }}
   annotations:
-    {{- toYaml .Values.persistence.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   accessModes:

charts/frankframework/templates/service.yaml

@@ -1,6 +1,13 @@
 apiVersion: v1
 kind: Service
-{{ template "frankframework.metadata" . }}
+metadata:
+  name: {{ include "frankframework.fullname" . }}
+  labels:
+    {{- include "frankframework.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/frankframework/values.schema.json

@@ -435,6 +435,11 @@
                     "type": "number",
                     "description": "Frank!Framework service port",
                     "default": 80
+                },
+                "annotations": {
+                    "type": "object",
+                    "description": "Additional annotations for the Frank!Framework service",
+                    "default": {}
                 }
             }
         },

charts/frankframework/values.yaml

@@ -297,6 +297,9 @@ service:
   type: ClusterIP
   ## @param service.port Frank!Framework service port
   port: 80
+  ## @param service.annotations Additional annotations for the Frank!Framework service
+  ##
+  annotations: {}
 
 ## Configure the ingress resource that allows you to access the Frank!Framework installation
 ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/