Merge branch 'main' into datadir-signed-fix

Signed-off-by: Jesse Hitch <[email protected]>
nextcloud · Jul 22, 2024 · ccff3a6 · ccff3a6
2 parents 7886807 + ddf49e9
commit ccff3a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -165,6 +165,7 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `cronjob.securityContext`                                  | Optional security context for cron jobs sidecar                                                     | `nil`                      |
 | `service.type`                                             | Kubernetes Service type                                                                             | `ClusterIP`                |
 | `service.loadBalancerIP`                                   | LoadBalancerIp for service type LoadBalancer                                                        | `""`                       |
+| `service.annotations`                                      | Annotations for service type                                                                        | `{}`                       |
 | `service.nodePort`                                         | NodePort for service type NodePort                                                                  | `nil`                      |
 | `service.ipFamilies`                                       | Set ipFamilies as in k8s service objects                                                            | `nil`                      |
 | `service.ipFamyPolicy`                                     | define IP protocol bindings as in k8s service objects                                               | `nil`                      |

diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
@@ -3,6 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "nextcloud.fullname" . }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "nextcloud.name" . }}
     helm.sh/chart: {{ include "nextcloud.chart" . }}
@@ -17,7 +21,7 @@ spec:
   {{- end }}
   {{- end }}
   {{- with .Values.service.ipFamilies }}
-  ipFamilies: 
+  ipFamilies:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.service.ipFamilyPolicy }}
@@ -34,4 +38,4 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "nextcloud.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/component: app
+    app.kubernetes.io/component: app
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -410,6 +410,9 @@ service:
   port: 8080
   loadBalancerIP: ""
   nodePort: nil
+  annotations: {}
+    ## Insert your annotations such as below
+    # test/test: pumuckel
 
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/