Skip to content

Commit b22ecf6

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents c8d0144 + da80a8d commit b22ecf6

4 files changed

Lines changed: 23 additions & 2 deletions

File tree

charts/nextcloud/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: nextcloud
3-
version: 8.0.1
3+
version: 8.2.0
44
# renovate: image=docker.io/library/nextcloud
5-
appVersion: 31.0.9
5+
appVersion: 32.0.0
66
description: A file sharing server that puts the control and security of your own data back into your hands.
77
keywords:
88
- nextcloud

charts/nextcloud/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ The following table lists the configurable parameters of the nextcloud chart and
214214
| `cronjob.cronjob.successfulJobsHistoryLimit` | Number of successful jobs to keep in history | `3` |
215215
| `cronjob.cronjob.failedJobsHistoryLimit` | Number of failed jobs to keep in history | `5` |
216216
| `cronjob.cronjob.labels` | An array of service labels | `nil` |
217+
| `cronjob.cronjob.podLabels` | An array of service labels | `nil` |
217218
| `cronjob.cronjob.annotations` | An array of service annotations | `nil` |
218219
| `cronjob.cronjob.backoffLimit` | The number of retries before marking a job as failed | `1` |
219220
| `cronjob.cronjob.affinity` | The affinity settings for the cron job | `{}` |

charts/nextcloud/templates/cronjob.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ spec:
2929
spec:
3030
backoffLimit: {{ .backoffLimit }}
3131
template:
32+
metadata:
33+
labels:
34+
{{- with (mergeOverwrite (dict) $.Values.podLabels .podLabels) }}
35+
{{- toYaml . | nindent 12 }}
36+
{{- end }}
3237
spec:
3338
restartPolicy: Never
3439
containers:

charts/nextcloud/values.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,11 @@ externalDatabase:
411411
# hostKey: db-hostname-or-ip
412412
# databaseKey: db-name
413413

414+
global:
415+
security:
416+
# required for bitnamilegacy repos
417+
allowInsecureImages: true
418+
414419
##
415420
## MariaDB chart configuration
416421
## ref: https://github.com/bitnami/charts/tree/main/bitnami/mariadb
@@ -421,6 +426,9 @@ mariadb:
421426
# To use an ALREADY DEPLOYED mariadb database, set this to false and configure the externalDatabase parameters
422427
enabled: false
423428

429+
image:
430+
repository: bitnamilegacy/mariadb
431+
424432
# see: https://github.com/bitnami/charts/tree/main/bitnami/mariadb#global-parameters
425433
global:
426434
# overwrites the primary.persistence.storageClass value
@@ -454,6 +462,8 @@ mariadb:
454462
##
455463
postgresql:
456464
enabled: false
465+
image:
466+
repository: bitnamilegacy/postgresql
457467
global:
458468
postgresql:
459469
# global.postgresql.auth overrides postgresql.auth
@@ -506,6 +516,8 @@ externalRedis:
506516

507517
redis:
508518
enabled: false
519+
image:
520+
repository: bitnamilegacy/redis
509521
auth:
510522
enabled: true
511523
password: "changeme"
@@ -624,7 +636,10 @@ cronjob:
624636
schedule: "*/5 * * * *"
625637
successfulJobsHistoryLimit: 3
626638
failedJobsHistoryLimit: 5
639+
# -- Additional labels for cronjob
627640
labels: {}
641+
# -- Additional labels for cronjob pod
642+
podLabels: {}
628643
annotations: {}
629644
backoffLimit: 1
630645
affinity: {}

0 commit comments

Comments
 (0)