Skip to content
This repository was archived by the owner on Dec 14, 2025. It is now read-only.

Commit 93698b2

Browse files
MichaelSpMichaelSp
authored
Merge branch 'main' into renovate/postgresql-16.x
Signed-off-by: Michael <MichaelSp@users.noreply.github.com>
2 parents 2db62a8 + 82bf6d7 commit 93698b2

22 files changed

+120
-163
lines changed

‎charts/nextcloud/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies:
1010
version: 20.6.1
1111
- name: collabora-online
1212
repository: https://collaboraonline.github.io/online
13-
version: 1.1.33
14-
digest: sha256:6db428a7c2899fd1964a4a5d21e092a30867eab200d98d3689a9367762b59ecb
15-
generated: "2025-02-21T23:38:12.87023204Z"
13+
version: 1.1.35
14+
digest: sha256:14181bf41c5b52f3ef487c854796ed6fede8ff915bd164ced5d82ab26533ab75
15+
generated: "2025-03-03T10:44:46.387429208Z"

‎charts/nextcloud/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nextcloud
33
version: 6.6.9-build.1
44
# renovate: image=docker.io/library/nextcloud
5-
appVersion: 30.0.5
5+
appVersion: 30.0.6
66
description: A file sharing server that puts the control and security of your own data back into your hands.
77
keywords:
88
- nextcloud
@@ -40,7 +40,7 @@ dependencies:
4040
repository: oci://registry-1.docker.io/bitnamicharts
4141
condition: redis.enabled
4242
- name: collabora-online
43-
version: 1.1.33
43+
version: 1.1.35
4444
repository: https://collaboraonline.github.io/online
4545
condition: collabora.enabled
4646
alias: collabora

‎charts/nextcloud/README.md‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ The following table lists the configurable parameters of the nextcloud chart and
190190
| `redis.global.storageClass` | PVC Storage Class for both Redis&reg; master and replica Persistent Volumes | `''` |
191191
| `redis.master.persistence.enabled` | Enable persistence on Redis&reg; master nodes using Persistent Volume Claims | `true` |
192192
| `redis.replica.persistence.enabled` | Enable persistence on Redis&reg; replica nodes using Persistent Volume Claims | `true` |
193+
| `cronjob.command` | The command the cronjob container executes | `/cron.sh` |
193194
| `cronjob.enabled` | Whether to enable/disable cron jobs sidecar | `false` |
194195
| `cronjob.lifecycle.postStartCommand` | Specify deployment lifecycle hook postStartCommand for the cron jobs sidecar | `nil` |
195196
| `cronjob.lifecycle.preStopCommand` | Specify deployment lifecycle hook preStopCommand for the cron jobs sidecar | `nil` |
@@ -359,22 +360,20 @@ The [Nextcloud](https://hub.docker.com/_/nextcloud/) image stores the nextcloud
359360
Persistent Volume Claims are used to keep the data across deployments. This is known to work with GKE, EKS, K3s, and minikube.
360361
Nextcloud will *not* delete the PVCs when uninstalling the helm chart.
361362

362-
363-
| Parameter | Description | Default |
364-
|-------------------------------------------|------------------------------------------------------|---------------------------------------------|
365-
| `persistence.enabled` | Enable persistence using PVC | `false` |
366-
| `persistence.annotations` | PVC annotations | `{}` |
367-
| `persistence.storageClass` | PVC Storage Class for nextcloud volume | `nil` (uses alpha storage class annotation) |
368-
| `persistence.existingClaim` | An Existing PVC name for nextcloud volume | `nil` (uses alpha storage class annotation) |
369-
| `persistence.accessMode` | PVC Access Mode for nextcloud volume | `ReadWriteOnce` |
370-
| `persistence.size` | PVC Storage Request for nextcloud volume | `8Gi` |
371-
| `persistence.nextcloudData.enabled` | Create a second PVC for the data folder in nextcloud | `false` |
372-
| `persistence.nextcloudData.annotations` | see `persistence.annotations` | `{}` |
373-
| `persistence.nextcloudData.storageClass` | see `persistence.storageClass` | `nil` (uses alpha storage class annotation) |
374-
| `persistence.nextcloudData.existingClaim` | see `persistence.existingClaim` | `nil` (uses alpha storage class annotation) |
375-
| `persistence.nextcloudData.accessMode` | see `persistence.accessMode` | `ReadWriteOnce` |
376-
| `persistence.nextcloudData.size` | see `persistence.size` | `8Gi` |
377-
363+
| Parameter | Description | Default |
364+
| ----------------------------------------- | ---------------------------------------------------- | --------------- |
365+
| `persistence.enabled` | Enable persistence using PVC | `false` |
366+
| `persistence.annotations` | PVC annotations | `{}` |
367+
| `persistence.storageClass` | PVC Storage Class for nextcloud volume | `nil` |
368+
| `persistence.existingClaim` | An Existing PVC name for nextcloud volume | `nil` |
369+
| `persistence.accessMode` | PVC Access Mode for nextcloud volume | `ReadWriteOnce` |
370+
| `persistence.size` | PVC Storage Request for nextcloud volume | `8Gi` |
371+
| `persistence.nextcloudData.enabled` | Create a second PVC for the data folder in nextcloud | `false` |
372+
| `persistence.nextcloudData.annotations` | see `persistence.annotations` | `{}` |
373+
| `persistence.nextcloudData.storageClass` | see `persistence.storageClass` | `nil` |
374+
| `persistence.nextcloudData.existingClaim` | see `persistence.existingClaim` | `nil` |
375+
| `persistence.nextcloudData.accessMode` | see `persistence.accessMode` | `ReadWriteOnce` |
376+
| `persistence.nextcloudData.size` | see `persistence.size` | `8Gi` |
378377

379378
### Metrics Configurations
380379

@@ -504,25 +503,25 @@ The nextcloud deployment includes a series of different probes you can use to de
504503

505504
This section provides options to enable and configure the Collabora Online server within your deployment. Please ensure to review the [Collabora Online Helm chart documentation](https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm/collabora-online) for additional details and recommended values.
506505

507-
| Parameter | Description | Default |
508-
|----------------------------------------|----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
509-
| `collabora.enabled` | Enable or disable the Collabora Online integration | `false` |
510-
| `collabora.autoscaling.enabled` | Enable or disable autoscaling for the Collabora Online pods | `false` |
511-
| `collabora.collabora.aliasgroups` | List of HTTPS nextcloud domains if Collabora is behind a reverse proxy | `[]` |
512-
| `collabora.collabora.extra_params` | Additional parameters for the Collabora Online service | `"--o:ssl.enabled=false"` |
513-
| `collabora.collabora.server_name` | Specify the server name when the hostname is not directly reachable (e.g., behind a reverse proxy) | `null` |
514-
| `collabora.existingSecret.enabled` | Enable using existing secret for admin login credentials | `false` |
515-
| `collabora.existingSecret.secretName` | Name of the existing secret containing admin login credentials | `""` |
516-
| `collabora.existingSecret.usernameKey` | Key in the secret for the admin username | `"username"` |
517-
| `collabora.existingSecret.passwordKey` | Key in the secret for the admin password | `"password"` |
518-
| `collabora.collabora.username` | Admin username for Collabora Online | `admin` |
519-
| `collabora.collabora.password` | Admin password for Collabora Online | `examplepass` |
520-
| `collabora.ingress.enabled` | Enable or disable ingress for Collabora Online | `false` |
521-
| `collabora.ingress.className` | Class name for the ingress controller | `""` |
522-
| `collabora.ingress.annotations` | Annotations for the ingress resource | `{}` |
523-
| `collabora.ingress.hosts` | List of hosts for the Collabora ingress | `[{"host": "chart-example.local", "paths": [{"path": "/", "pathType": "ImplementationSpecific"}]}]` |
524-
| `collabora.ingress.tls` | TLS configuration for the Collabora ingress | `[]` |
525-
| `collabora.resources` | Resource requests and limits for the Collabora Online pods | `{}` |
506+
| Parameter | Description | Default |
507+
|--------------------------------------------------|----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
508+
| `collabora.enabled` | Enable or disable the Collabora Online integration | `false` |
509+
| `collabora.autoscaling.enabled` | Enable or disable autoscaling for the Collabora Online pods | `false` |
510+
| `collabora.collabora.aliasgroups` | List of HTTPS nextcloud domains if Collabora is behind a reverse proxy | `[]` |
511+
| `collabora.collabora.extra_params` | Additional parameters for the Collabora Online service | `"--o:ssl.enabled=false"` |
512+
| `collabora.collabora.server_name` | Specify the server name when the hostname is not directly reachable (e.g., behind a reverse proxy) | `null` |
513+
| `collabora.collabora.existingSecret.enabled` | Enable using existing secret for admin login credentials | `false` |
514+
| `collabora.collabora.existingSecret.secretName` | Name of the existing secret containing admin login credentials | `""` |
515+
| `collabora.collabora.existingSecret.usernameKey` | Key in the secret for the admin username | `"username"` |
516+
| `collabora.collabora.existingSecret.passwordKey` | Key in the secret for the admin password | `"password"` |
517+
| `collabora.collabora.username` | Admin username for Collabora Online | `admin` |
518+
| `collabora.collabora.password` | Admin password for Collabora Online | `examplepass` |
519+
| `collabora.ingress.enabled` | Enable or disable ingress for Collabora Online | `false` |
520+
| `collabora.ingress.className` | Class name for the ingress controller | `""` |
521+
| `collabora.ingress.annotations` | Annotations for the ingress resource | `{}` |
522+
| `collabora.ingress.hosts` | List of hosts for the Collabora ingress | `[{"host": "chart-example.local", "paths": [{"path": "/", "pathType": "ImplementationSpecific"}]}]` |
523+
| `collabora.ingress.tls` | TLS configuration for the Collabora ingress | `[]` |
524+
| `collabora.resources` | Resource requests and limits for the Collabora Online pods | `{}` |
526525
> **Note**:
527526
>
528527
> You may need to uncomment `collabora.collabora.aliasgroups` and `collabora.collabora.extra_params`, depending on your setup. You may also need to set `collabora.collabora.server_name`. If left empty, it's derived from the request, so please set it if it doesn't work.

‎charts/nextcloud/templates/_helpers.tpl‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,3 +398,37 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
398398
subPath: {{ $key }}
399399
{{- end }}
400400
{{- end -}}
401+
402+
403+
{{/*
404+
Create match labels for the nextcloud container as well as the cronjob container.
405+
Parameters:
406+
- component (optional): app/cronjob/...
407+
- rootContext: $ (Inside a template the scope changes, i.e. you cannot access variables of the parent context or its parents.
408+
Unfortunately this is also the case for the root context, this means .Values, .Release, .Chart cannot be accessed.
409+
However the other templates need values from the objects. That's why the caller has to pass on reference to the root context which this template in turn passes on.)
410+
*/}}
411+
{{- define "nextcloud.selectorLabels" -}}
412+
app.kubernetes.io/name: {{ include "nextcloud.name" .rootContext }}
413+
app.kubernetes.io/instance: {{ .rootContext.Release.Name }}
414+
{{- if .component }}
415+
app.kubernetes.io/component: {{ .component }}
416+
{{- end }}
417+
{{- end -}}
418+
419+
{{/*
420+
Create match labels for the nextcloud deployment as well as the cronjob.
421+
Parameters:
422+
- component (optional): app/cronjob/...
423+
- rootContext: $ (Inside a template the scope changes, i.e. you cannot access variables of the parent context or its parents.
424+
Unfortunately this is also the case for the root context, this means .Values, .Release, .Chart cannot be accessed.
425+
However the other templates need values from the objects. That's why the caller has to pass on reference to the root context which this template in turn passes on.)
426+
*/}}
427+
{{- define "nextcloud.labels" -}}
428+
{{ include "nextcloud.selectorLabels" ( dict "component" .component "rootContext" .rootContext) }}
429+
helm.sh/chart: {{ include "nextcloud.chart" .rootContext }}
430+
app.kubernetes.io/managed-by: {{ .rootContext.Release.Service }}
431+
{{- with .rootContext.Chart.AppVersion }}
432+
app.kubernetes.io/version: {{ quote . }}
433+
{{- end }}
434+
{{- end -}}

‎charts/nextcloud/templates/config.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ kind: ConfigMap
44
metadata:
55
name: {{ template "nextcloud.fullname" . }}-config
66
labels:
7-
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
8-
helm.sh/chart: {{ include "nextcloud.chart" . }}
9-
app.kubernetes.io/instance: {{ .Release.Name }}
10-
app.kubernetes.io/managed-by: {{ .Release.Service }}
7+
{{- include "nextcloud.labels" ( dict "rootContext" $ ) | nindent 4 }}
118
data:
129
{{- range $filename, $content := .Values.nextcloud.configs }}
1310
{{ $filename }}: |-

‎charts/nextcloud/templates/configmap-hooks.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: {{ template "nextcloud.fullname" . }}-hooks
77
labels:
8-
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
9-
helm.sh/chart: {{ include "nextcloud.chart" . }}
10-
app.kubernetes.io/instance: {{ .Release.Name }}
11-
app.kubernetes.io/managed-by: {{ .Release.Service }}
8+
{{- include "nextcloud.labels" ( dict "rootContext" $ ) | nindent 4 }}
129
data:
1310
{{- range $hook, $shell := .Values.nextcloud.hooks }}
1411
{{- if $shell }}

‎charts/nextcloud/templates/db-secret.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ kind: Secret
66
metadata:
77
name: {{ .Release.Name }}-db
88
labels:
9-
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
10-
helm.sh/chart: {{ include "nextcloud.chart" . }}
11-
app.kubernetes.io/instance: {{ .Release.Name }}
12-
app.kubernetes.io/managed-by: {{ .Release.Service }}
9+
{{- include "nextcloud.labels" ( dict "rootContext" $ ) | nindent 4 }}
1310
type: Opaque
1411
data:
1512
{{- if .Values.mariadb.enabled }}

0 commit comments

Comments
 (0)