Skip to content

[pull] main from nextcloud:main #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelSp merged 9 commits into from
Nov 8, 2025
Merged

[pull] main from nextcloud:main #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09fa919
fix(nextcloud): lower outdated apps prometheus alertrule to info #784
ojsef39 Oct 4, 2025
8440e74
feat(nextcloud): allow imagePullSecrets for cronjob #781
mazinsfr Oct 4, 2025
8796b9f
feat(nextcloud): add topologySpreadConstraints support #782
mazinsfr Oct 7, 2025
6ef85d1
fix(nextcloud): cronjob not working with no $.Values.podLabels set #785
ojsef39 Oct 10, 2025
6e871a0
feat(pvc): add extra labels on pvcs #793
DrummyFloyd Oct 23, 2025
1a8f7b3
fix(nextcloud): update AppVersion to v32.0.1 #795
wrenix Oct 25, 2025
ab87ad7
chore(deps): bump helm/kind-action from 1.12.0 to 1.13.0
dependabot[bot] Nov 3, 2025
8b83ab1
Merge pull request #800 from nextcloud/dependabot/github_actions/helm…
varet80 Nov 4, 2025
2191712
fix(docs): typo in README.md for ipFamilyPolicy #796
kiaraly Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
fi

- name: Create kind cluster
uses: helm/kind-action@v1.12.0
uses: helm/kind-action@v1.13.0
if: steps.list-changed.outputs.changed == 'true'

- name: Install MinIO for testing S3 as Primary Storage
Expand Down
4 changes: 2 additions & 2 deletions charts/nextcloud/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: nextcloud
version: 8.2.0
version: 8.5.2
# renovate: image=docker.io/library/nextcloud
appVersion: 32.0.0
appVersion: 32.0.1
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
- nextcloud
Expand Down
48 changes: 26 additions & 22 deletions charts/nextcloud/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ The following table lists the configurable parameters of the nextcloud chart and
| `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` |
| `service.ipFamilyPolicy` | define IP protocol bindings as in k8s service objects | `nil` |
| `service.sessionAffinity` | Kubernetes service Session Affinity | `nil` |
| `service.sessionAffinityConfig` | Kubernetes service Session Affinity configuration | `{}` |
| `phpClientHttpsFix.enabled` | Sets OVERWRITEPROTOCOL for https ingress redirect | `false` |
Expand All @@ -245,6 +245,7 @@ The following table lists the configurable parameters of the nextcloud chart and
| `podLabels` | Labels to be added at 'pod' level | not set |
| `podAnnotations` | Annotations to be added at 'pod' level | not set |
| `dnsConfig` | Custom dnsConfig for nextcloud containers | `{}` |
| `topologySpreadConstraints` | TopologySpreadConstraints for nextcloud pod and cronjob pod | `{}` |

### Ingress
#### Ingress Sticky-Sessions
Expand Down Expand Up @@ -391,12 +392,14 @@ Nextcloud will *not* delete the PVCs when uninstalling the helm chart.
| ----------------------------------------- | ---------------------------------------------------- | --------------- |
| `persistence.enabled` | Enable persistence using PVC | `false` |
| `persistence.annotations` | PVC annotations | `{}` |
| `persistence.labels` | PVC labels | `{}` |
| `persistence.storageClass` | PVC Storage Class for nextcloud volume | `nil` |
| `persistence.existingClaim` | An Existing PVC name for nextcloud volume | `nil` |
| `persistence.accessMode` | PVC Access Mode for nextcloud volume | `ReadWriteOnce` |
| `persistence.size` | PVC Storage Request for nextcloud volume | `8Gi` |
| `persistence.nextcloudData.enabled` | Create a second PVC for the data folder in nextcloud | `false` |
| `persistence.nextcloudData.annotations` | see `persistence.annotations` | `{}` |
| `persistence.nextcloudData.labels` | see `persistence.labels` | `{}` |
| `persistence.nextcloudData.storageClass` | see `persistence.storageClass` | `nil` |
| `persistence.nextcloudData.existingClaim` | see `persistence.existingClaim` | `nil` |
| `persistence.nextcloudData.accessMode` | see `persistence.accessMode` | `ReadWriteOnce` |
Expand Down Expand Up @@ -561,27 +564,28 @@ This section provides options to enable and configure the Collabora Online serve

We include an optional external preview provider from [h2non/imaginary](https://github.com/h2non/imaginary).

| Parameter | Description | Default |
| ---------------------------------- | -------------------------------------------------------------------------------------- | ----------------- |
| `imaginary.enabled` | Start Imaginary | `false` |
| `imaginary.replicaCount` | Number of imaginary pod replicas to deploy | `1` |
| `imaginary.image.registry` | Imaginary image name | `docker.io` |
| `imaginary.image.repository` | Imaginary image name | `h2non/imaginary` |
| `imaginary.image.tag` | Imaginary image tag | `1.2.4` |
| `imaginary.image.pullPolicy` | Imaginary image pull policy | `IfNotPresent` |
| `imaginary.image.pullSecrets` | Imaginary image pull secrets | `nil` |
| `imaginary.podAnnotations` | Additional annotations for imaginary | `{}` |
| `imaginary.podLabels` | Additional labels for imaginary | `{}` |
| `imaginary.nodeSelector` | Imaginary pod nodeSelector | `{}` |
| `imaginary.tolerations` | Imaginary pod tolerations | `[]` |
| `imaginary.resources` | imaginary resources | `{}` |
| `imaginary.securityContext` | Optional security context for the Imaginary container | `nil` |
| `imaginary.podSecurityContext` | Optional security context for the Imaginary pod (applies to all containers in the pod) | `nil` |
| `imaginary.service.type` | Imaginary: Kubernetes Service type | `ClusterIP` |
| `imaginary.service.loadBalancerIP` | Imaginary: LoadBalancerIp for service type LoadBalancer | `nil` |
| `imaginary.service.nodePort` | Imaginary: NodePort for service type NodePort | `nil` |
| `imaginary.service.annotations` | Additional annotations for service imaginary | `{}` |
| `imaginary.service.labels` | Additional labels for service imaginary | `{}` |
| Parameter | Description | Default |
| ------------------------------------- | -------------------------------------------------------------------------------------- | ----------------- |
| `imaginary.enabled` | Start Imaginary | `false` |
| `imaginary.replicaCount` | Number of imaginary pod replicas to deploy | `1` |
| `imaginary.image.registry` | Imaginary image name | `docker.io` |
| `imaginary.image.repository` | Imaginary image name | `h2non/imaginary` |
| `imaginary.image.tag` | Imaginary image tag | `1.2.4` |
| `imaginary.image.pullPolicy` | Imaginary image pull policy | `IfNotPresent` |
| `imaginary.image.pullSecrets` | Imaginary image pull secrets | `nil` |
| `imaginary.podAnnotations` | Additional annotations for imaginary | `{}` |
| `imaginary.podLabels` | Additional labels for imaginary | `{}` |
| `imaginary.nodeSelector` | Imaginary pod nodeSelector | `{}` |
| `imaginary.tolerations` | Imaginary pod tolerations | `[]` |
| `imaginary.topologySpreadConstraints` | Imaginary pod topologySpreadConstraints | `[]` |
| `imaginary.resources` | imaginary resources | `{}` |
| `imaginary.securityContext` | Optional security context for the Imaginary container | `nil` |
| `imaginary.podSecurityContext` | Optional security context for the Imaginary pod (applies to all containers in the pod) | `nil` |
| `imaginary.service.type` | Imaginary: Kubernetes Service type | `ClusterIP` |
| `imaginary.service.loadBalancerIP` | Imaginary: LoadBalancerIp for service type LoadBalancer | `nil` |
| `imaginary.service.nodePort` | Imaginary: NodePort for service type NodePort | `nil` |
| `imaginary.service.annotations` | Additional annotations for service imaginary | `{}` |
| `imaginary.service.labels` | Additional labels for service imaginary | `{}` |


> [!Note]
Expand Down
10 changes: 10 additions & 0 deletions charts/nextcloud/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
spec:
{{- with $.Values.image.pullSecrets }}
imagePullSecrets:
{{- range . }}
- name: {{ . }}
{{- end}}
{{- end }}
restartPolicy: Never
containers:
- name: {{ $.Chart.Name }}-cron
Expand Down Expand Up @@ -64,6 +70,10 @@ spec:
tolerations:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with $.Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}{{/* end with cronjob */}}
volumes:
- name: nextcloud-main
Expand Down
4 changes: 4 additions & 0 deletions charts/nextcloud/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,10 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: nextcloud-main
{{- if .Values.persistence.enabled }}
Expand Down
4 changes: 4 additions & 0 deletions charts/nextcloud/templates/imaginary/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,8 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.imaginary.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/nextcloud/templates/metrics/prometheus-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
- alert: "nextcloud: outdated apps"
expr: 'sum(nextcloud_apps_updates_available_total{ {{ $filter }} }) without(endpoint,container,pod,instance) > 0'
labels:
severity: "warning"
severity: "info"
{{- with .labels }}
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/nextcloud/templates/nextcloud-data-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
name: {{ template "nextcloud.fullname" . }}-nextcloud-data
labels:
{{- include "nextcloud.labels" ( dict "component" "app" "rootContext" $ ) | nindent 4 }}
{{- with .Values.persistence.nextcloudData.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
helm.sh/resource-policy: keep
{{- with .Values.persistence.nextcloudData.annotations }}
Expand Down
3 changes: 3 additions & 0 deletions charts/nextcloud/templates/nextcloud-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
name: {{ template "nextcloud.fullname" . }}-nextcloud
labels:
{{- include "nextcloud.labels" ( dict "component" "app" "rootContext" $ ) | nindent 4 }}
{{- with .Values.persistence.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
annotations:
helm.sh/resource-policy: keep
{{- with .Values.persistence.annotations }}
Expand Down
8 changes: 8 additions & 0 deletions charts/nextcloud/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ image:
nameOverride: ""
fullnameOverride: ""
podAnnotations: {}
podLabels: {}
deploymentAnnotations: {}
deploymentLabels: {}

Expand Down Expand Up @@ -702,6 +703,7 @@ persistence:
# Nextcloud Data (/var/www/html)
enabled: false
annotations: {}
labels: {}
## nextcloud data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
Expand All @@ -724,6 +726,7 @@ persistence:
nextcloudData:
enabled: false
subPath:
labels: {}
annotations: {}
# storageClass: "-"
# existingClaim:
Expand Down Expand Up @@ -781,6 +784,9 @@ nodeSelector: {}

tolerations: []

# -- Nextcloud pod topologySpreadConstraints
topologySpreadConstraints: []

affinity: {}

dnsConfig: {}
Expand Down Expand Up @@ -816,6 +822,8 @@ imaginary:
nodeSelector: {}
# -- Imaginary pod tolerations
tolerations: []
# -- Imaginary pod topologySpreadConstraints
topologySpreadConstraints: []

# -- imaginary resources
resources: {}
Expand Down