From 4d3e4b725251a9b8670df3f7775d0b6ef3d6de06 Mon Sep 17 00:00:00 2001 From: Dominic Giebert Date: Wed, 28 Feb 2024 17:31:42 +0100 Subject: [PATCH 01/16] Added support for Built-in CODE Server (ARM64) Signed-off-by: Dominic Giebert --- charts/nextcloud/templates/nginx-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/templates/nginx-config.yaml b/charts/nextcloud/templates/nginx-config.yaml index aa5326a8..7c0df78d 100644 --- a/charts/nextcloud/templates/nginx-config.yaml +++ b/charts/nextcloud/templates/nginx-config.yaml @@ -104,7 +104,7 @@ # to the URI, resulting in a HTTP 500 error response. location ~ \.php(?:$|/) { # Required for legacy support - rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri; fastcgi_split_path_info ^(.+?\.php)(/.*)$; set $path_info $fastcgi_path_info; From ef52a6f5980830e7c03755b81e13c285d596425e Mon Sep 17 00:00:00 2001 From: Dominic Giebert Date: Thu, 29 Feb 2024 08:28:32 +0100 Subject: [PATCH 02/16] Bump patch version Signed-off-by: Dominic Giebert --- charts/nextcloud/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 31f18390..82cf42c7 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.2 +version: 4.6.3 appVersion: 28.0.2 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: From 1b1d4caba61412a4e1e2c1e7e7d3874dc3b27741 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Thu, 29 Feb 2024 20:29:59 +0100 Subject: [PATCH 03/16] Update to 28.0.3 Signed-off-by: provokateurin --- charts/nextcloud/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 82cf42c7..58962439 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nextcloud -version: 4.6.3 -appVersion: 28.0.2 +version: 4.6.4 +appVersion: 28.0.3 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - nextcloud From 5fc7fc56396dfeab44124eb3ae328472455a1943 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Sat, 30 Mar 2024 18:19:51 +0100 Subject: [PATCH 04/16] Update nextcloud appVersion to 28.0.4 Signed-off-by: JesseBot --- charts/nextcloud/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 58962439..8ae04020 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nextcloud -version: 4.6.4 -appVersion: 28.0.3 +version: 4.6.5 +appVersion: 28.0.4 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - nextcloud From d5e757cf50f10ab7a0f39158b1f06d03be62da3a Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Wed, 10 Apr 2024 20:55:50 +0200 Subject: [PATCH 05/16] feat: keep PVCs when uninstalling helm chart Signed-off-by: Nikolas Rimikis --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 1 + charts/nextcloud/templates/nextcloud-data-pvc.yaml | 3 ++- charts/nextcloud/templates/nextcloud-pvc.yaml | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 8ae04020..876c6238 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.5 +version: 4.6.6 appVersion: 28.0.4 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md index 9d87425a..6581b09c 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -257,6 +257,7 @@ Is there a missing parameter for one of the Bitnami helm charts listed above? Pl The [Nextcloud](https://hub.docker.com/_/nextcloud/) image stores the nextcloud data and configurations at the `/var/www/html` paths of the container. Persistent Volume Claims are used to keep the data across deployments. This is known to work with GKE, EKS, K3s, and minikube. +Nextcloud will *not* delete the PVCs when uninstalling the helm chart. | Parameter | Description | Default | diff --git a/charts/nextcloud/templates/nextcloud-data-pvc.yaml b/charts/nextcloud/templates/nextcloud-data-pvc.yaml index d10900a8..3a66404a 100644 --- a/charts/nextcloud/templates/nextcloud-data-pvc.yaml +++ b/charts/nextcloud/templates/nextcloud-data-pvc.yaml @@ -10,8 +10,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/component: app - {{- with .Values.persistence.nextcloudData.annotations }} annotations: + helm.sh/resource-policy: keep + {{- with .Values.persistence.nextcloudData.annotations }} {{- toYaml . | nindent 4 }} {{- end }} spec: diff --git a/charts/nextcloud/templates/nextcloud-pvc.yaml b/charts/nextcloud/templates/nextcloud-pvc.yaml index 6bdd620b..893c952f 100644 --- a/charts/nextcloud/templates/nextcloud-pvc.yaml +++ b/charts/nextcloud/templates/nextcloud-pvc.yaml @@ -9,8 +9,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/component: app - {{- with .Values.persistence.annotations }} annotations: + helm.sh/resource-policy: keep + {{- with .Values.persistence.annotations }} {{- toYaml . | nindent 4 }} {{- end }} spec: From 4ec43d8781ec5e11e2355c017ecf92823641012a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:21:08 +0000 Subject: [PATCH 06/16] Bump azure/setup-helm from 3.5 to 4 Bumps [azure/setup-helm](https://github.com/azure/setup-helm) from 3.5 to 4. - [Release notes](https://github.com/azure/setup-helm/releases) - [Changelog](https://github.com/Azure/setup-helm/blob/main/CHANGELOG.md) - [Commits](https://github.com/azure/setup-helm/compare/v3.5...v4) --- updated-dependencies: - dependency-name: azure/setup-helm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint-test.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 45739610..d839bc71 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Install Helm - uses: azure/setup-helm@v3.5 + uses: azure/setup-helm@v4 with: version: v3.11.1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8115309d..ca842db1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: # See https://github.com/helm/chart-releaser-action/issues/6 - name: Set up Helm - uses: azure/setup-helm@v3.5 + uses: azure/setup-helm@v4 with: version: v3.11.1 From 032d432357185cc23c0c434305c9827f4a4b1dad Mon Sep 17 00:00:00 2001 From: JesseBot Date: Fri, 12 Apr 2024 22:28:49 +0200 Subject: [PATCH 07/16] Update lint-test.yaml - update helm version to v3.14.4 Signed-off-by: JesseBot --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index d839bc71..02a30651 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -22,7 +22,7 @@ jobs: - name: Install Helm uses: azure/setup-helm@v4 with: - version: v3.11.1 + version: v3.14.4 - name: Add dependency chart repos run: | From 02e398b4e7378232dd5e7d489909785ca8ef8160 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Fri, 12 Apr 2024 22:29:41 +0200 Subject: [PATCH 08/16] Update .github/workflows/release.yaml - update helm version to v3.14.4 Signed-off-by: JesseBot --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ca842db1..d81aaca1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,7 +30,7 @@ jobs: - name: Set up Helm uses: azure/setup-helm@v4 with: - version: v3.11.1 + version: v3.14.4 - name: Add dependency chart repos run: | From 504c1f3f70e8bd03c1c664d61bc2396b04206602 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:51:19 +0000 Subject: [PATCH 09/16] Bump helm/kind-action from 1.8.0 to 1.10.0 Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.8.0 to 1.10.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](https://github.com/helm/kind-action/compare/v1.8.0...v1.10.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 45739610..b28fd25e 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -45,7 +45,7 @@ jobs: run: ct lint --target-branch ${{ github.event.repository.default_branch }} - name: Create kind cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.10.0 if: steps.list-changed.outputs.changed == 'true' - name: Run chart-testing (install) From 45e290390aaf4223341447b3d2f780a473f5669b Mon Sep 17 00:00:00 2001 From: provokateurin Date: Fri, 26 Apr 2024 06:57:11 +0200 Subject: [PATCH 10/16] feat: Update appVersion to 29.0.0 Signed-off-by: provokateurin --- charts/nextcloud/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 876c6238..e9048363 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nextcloud -version: 4.6.6 -appVersion: 28.0.4 +version: 4.6.7 +appVersion: 29.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - nextcloud From 1ae7421fd91a9e3b30f4f3fa27f60e2481dbbd63 Mon Sep 17 00:00:00 2001 From: kahirokunn Date: Wed, 1 May 2024 19:51:15 +0900 Subject: [PATCH 11/16] chore: Prevent displaying constant diffs for nextcloud-token in ArgoCD (#554) * chore: Prevent displaying constant diffs for nextcloud-token in ArgoCD When metrics are not enabled, the use of randAlphaNum was causing constant diffs for nextcloud-token in ArgoCD. To mitigate this issue, now nextcloud-token won't be configured when metrics are not enabled. Signed-off-by: kahirokunn * Update charts/nextcloud/templates/secrets.yaml Co-authored-by: JesseBot Signed-off-by: kahirokunn * Update charts/nextcloud/Chart.yaml Co-authored-by: JesseBot Signed-off-by: kahirokunn --------- Signed-off-by: kahirokunn Signed-off-by: JesseBot Co-authored-by: JesseBot --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/templates/secrets.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index e9048363..243346f3 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.7 +version: 4.6.8 appVersion: 29.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/templates/secrets.yaml b/charts/nextcloud/templates/secrets.yaml index 9b3ed4f9..0858255e 100644 --- a/charts/nextcloud/templates/secrets.yaml +++ b/charts/nextcloud/templates/secrets.yaml @@ -17,9 +17,9 @@ data: {{- else }} nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} - {{- with .Values.metrics.token }} - nextcloud-token: {{ . | b64enc | quote }} - {{- else }} + {{- if and .Values.metrics.enabled .Values.metrics.token }} + nextcloud-token: {{ .Values.metrics.token | b64enc | quote }} + {{- else if and .Values.metrics.enabled (not .Values.metrics.token) }} nextcloud-token: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} {{- if .Values.nextcloud.mail.enabled }} From ba6ce9d9d1d1d1e1cb8ff94931420e4a392a0bc8 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 29 May 2024 15:58:53 +0200 Subject: [PATCH 12/16] only run chart linting for specific files instead of trying to catch every exception (#575) * only run chart linting for specific files instead of trying to catch every exception Signed-off-by: jessebot * attempt to adapt changes from https://github.com/nextcloud/.github/blob/master/workflow-templates/node.yml Signed-off-by: jessebot * add needs: changes to lint job Signed-off-by: jessebot * remove summary job afterall Signed-off-by: jessebot --------- Signed-off-by: jessebot --- .github/workflows/lint-test.yaml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 45739610..14c37ceb 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -2,17 +2,29 @@ name: Lint and Test Charts on: pull_request: - paths-ignore: - - '.github/**' - - 'charts/**/README.md' - - 'CODE_OF_CONDUCT.md' - - 'CONTRIBUTING.md' - - 'LICENSE' - - 'README.md' - + paths: jobs: + changes: + runs-on: ubuntu-latest-low + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: changes + continue-on-error: true + with: + filters: | + src: + - 'charts/nextcloud/Chart.yaml' + - 'charts/nextcloud/values.yaml' + - 'charts/nextcloud/templates/**' + lint-test: runs-on: ubuntu-22.04 + needs: changes + if: needs.changes.outputs.src != 'false' steps: - name: Checkout uses: actions/checkout@v4 From 7394c10b3dc518cb7ad33f96e62ee20acb539f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20M=C3=A9nab=C3=A9?= Date: Fri, 31 May 2024 08:54:09 +0200 Subject: [PATCH 13/16] Allow to set environment variables to Nginx container (#566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Ménabé Co-authored-by: JesseBot --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/README.md | 1 + charts/nextcloud/templates/deployment.yaml | 4 ++++ charts/nextcloud/values.yaml | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 243346f3..d4d18917 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.8 +version: 4.6.9 appVersion: 29.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md index 6581b09c..4df1a770 100644 --- a/charts/nextcloud/README.md +++ b/charts/nextcloud/README.md @@ -147,6 +147,7 @@ The following table lists the configurable parameters of the nextcloud chart and | `nginx.config.custom` | Specify a custom config for nginx | `{}` | | `nginx.resources` | nginx resources | `{}` | | `nginx.securityContext` | Optional security context for the nginx container | `nil` | +| `nginx.extraEnv` | Optional environment variables for the nginx container | `nil` | | `lifecycle.postStartCommand` | Specify deployment lifecycle hook postStartCommand | `nil` | | `lifecycle.preStopCommand` | Specify deployment lifecycle hook preStopCommand | `nil` | | `redis.enabled` | Whether to install/use redis for locking | `false` | diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml index be3aeea9..83546f42 100644 --- a/charts/nextcloud/templates/deployment.yaml +++ b/charts/nextcloud/templates/deployment.yaml @@ -149,6 +149,10 @@ spec: - name: {{ .Chart.Name }}-nginx image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" imagePullPolicy: {{ .Values.nginx.image.pullPolicy }} + {{- with .Values.nginx.extraEnv }} + env: + {{- toYaml . | nindent 12 }} + {{- end }} ports: - name: http protocol: TCP diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml index 8a0868dd..b2e7d28a 100644 --- a/charts/nextcloud/values.yaml +++ b/charts/nextcloud/values.yaml @@ -245,6 +245,11 @@ nginx: # runAsNonRoot: true # readOnlyRootFilesystem: true + ## Extra environment variables + extraEnv: [] + # - name: SOME_ENV + # value: ENV_VALUE + internalDatabase: enabled: true name: nextcloud From 961037fc016bc77e5191de32464d607c7d4a682a Mon Sep 17 00:00:00 2001 From: Tero Paloheimo Date: Sun, 2 Jun 2024 11:36:56 +0300 Subject: [PATCH 14/16] feat: update appVersion to 29.0.1 Signed-off-by: Tero Paloheimo --- charts/nextcloud/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index d4d18917..62fdfdc6 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nextcloud -version: 4.6.9 -appVersion: 29.0.0 +version: 4.6.10 +appVersion: 29.0.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - nextcloud From f8cf00730b4fd05a22a290d0773f8fd463f0bbcf Mon Sep 17 00:00:00 2001 From: Sunny Date: Sun, 9 Jun 2024 12:40:28 +0530 Subject: [PATCH 15/16] Include nextcloud service in trusted domains for metrics exporter (#483) * Include service in trusted domains for metrics When nextcloud-exporter is used by enabling metrics, it fails to fetch the serverinfo with 400 response code. This is related to the switch from ingress to local service endpoint for nextcloud-exporter. To fix this, in addition to .Values.nextcloud.host, the nextcloud service also need to be included in the trusted domains. Signed-off-by: Sunny * Update charts/nextcloud/templates/_helpers.tpl - use full service name and fix spacing for trusted domains Co-authored-by: WrenIX <133280015+wrenix@users.noreply.github.com> Signed-off-by: JesseBot --------- Signed-off-by: Sunny Signed-off-by: JesseBot Co-authored-by: JesseBot Co-authored-by: WrenIX <133280015+wrenix@users.noreply.github.com> --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/templates/_helpers.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 62fdfdc6..cee10d28 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.10 +version: 4.6.11 appVersion: 29.0.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl index 8214e1ab..d9570f76 100644 --- a/charts/nextcloud/templates/_helpers.tpl +++ b/charts/nextcloud/templates/_helpers.tpl @@ -178,7 +178,7 @@ Create environment variables used to configure the nextcloud container as well a name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }} key: {{ .Values.nextcloud.existingSecret.passwordKey }} - name: NEXTCLOUD_TRUSTED_DOMAINS - value: {{ .Values.nextcloud.host }} + value: {{ .Values.nextcloud.host }}{{ if .Values.metrics.enabled }} {{ template "nextcloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local{{ end }} {{- if ne (int .Values.nextcloud.update) 0 }} - name: NEXTCLOUD_UPDATE value: {{ .Values.nextcloud.update | quote }} From 3dfd22ed39d628c10868ec240b9e94dd5ee928f0 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Sun, 9 Jun 2024 09:38:05 +0200 Subject: [PATCH 16/16] =?UTF-8?q?Update=20Postgresql,=20MariaDB,=20and=20R?= =?UTF-8?q?edis=20subcharts=20to=20the=20latest=20(=E2=9A=A0=EF=B8=8F=20Ma?= =?UTF-8?q?jor=20updates)=20(#580)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update sub charts and add test for postgresql chart Signed-off-by: jessebot * temporarily change the changes workflow to run on ubuntu-22.04 Signed-off-by: jessebot * add helm and ct install steps for the installation jobs Signed-off-by: jessebot * always run change detection step in integration testing steps Signed-off-by: jessebot * always do a checkout before rest of integration test Signed-off-by: jessebot * update the runs-on parameter for changes job to use ubuntu-latest-low again Signed-off-by: jessebot --------- Signed-off-by: jessebot Signed-off-by: JesseBot --- .github/workflows/lint-test.yaml | 73 +++++++++++++++++++++++++++++++- charts/nextcloud/Chart.lock | 10 ++--- charts/nextcloud/Chart.yaml | 8 ++-- 3 files changed, 81 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 905affa6..ded95bf8 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,7 +21,7 @@ jobs: - 'charts/nextcloud/values.yaml' - 'charts/nextcloud/templates/**' - lint-test: + lint: runs-on: ubuntu-22.04 needs: changes if: needs.changes.outputs.src != 'false' @@ -56,6 +56,36 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: ct lint --target-branch ${{ github.event.repository.default_branch }} + test-internal-database: + runs-on: ubuntu-22.04 + needs: [changes, lint] + if: needs.changes.outputs.src != 'false' + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install Helm + uses: azure/setup-helm@v4 + with: + version: v3.14.4 + + - name: Add dependency chart repos + run: | + helm repo add bitnami https://charts.bitnami.com/bitnami + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.6.1 + + - name: Run chart-testing (list-changed) + id: list-changed + run: | + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) + if [[ -n "$changed" ]]; then + echo "changed=true" >> "$GITHUB_OUTPUT" + fi + - name: Create kind cluster uses: helm/kind-action@v1.10.0 if: steps.list-changed.outputs.changed == 'true' @@ -64,3 +94,44 @@ jobs: id: install if: steps.list-changed.outputs.changed == 'true' run: ct install --target-branch ${{ github.event.repository.default_branch }} + + test-postgresql-database: + runs-on: ubuntu-22.04 + needs: [changes, lint] + if: needs.changes.outputs.src != 'false' + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install Helm + uses: azure/setup-helm@v4 + with: + version: v3.14.4 + + - name: Add dependency chart repos + run: | + helm repo add bitnami https://charts.bitnami.com/bitnami + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.6.1 + + - name: Run chart-testing (list-changed) + id: list-changed + run: | + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) + if [[ -n "$changed" ]]; then + echo "changed=true" >> "$GITHUB_OUTPUT" + fi + + - name: Create kind cluster + uses: helm/kind-action@v1.10.0 + if: steps.list-changed.outputs.changed == 'true' + + - name: Run chart-testing (install) + id: install + if: steps.list-changed.outputs.changed == 'true' + run: | + ct install --target-branch ${{ github.event.repository.default_branch }} \ + --helm-extra-set-args "--set=postgresql.enabled=true --set=postgresql.global.postgresql.auth.password=testing123456 --set=internalDatabase.enabled=false --set=externalDatabase.enabled=True --set=externalDatabase.type=postgresql --set=externalDatabase.password=testing123456" diff --git a/charts/nextcloud/Chart.lock b/charts/nextcloud/Chart.lock index 8a002f80..f6ac2d62 100644 --- a/charts/nextcloud/Chart.lock +++ b/charts/nextcloud/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts - version: 12.12.10 + version: 15.5.0 - name: mariadb repository: oci://registry-1.docker.io/bitnamicharts - version: 12.2.9 + version: 18.2.0 - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 17.13.2 -digest: sha256:92fe0891c35c2586cfe3b76154412c188bb75cc0a687e1d771fc4c1cf0f8973d -generated: "2023-11-11T19:19:38.983179104+01:00" + version: 19.5.0 +digest: sha256:4efc098feeb7f4486b7166f1c71b9c54bfee0797663a3339f379d397297303c7 +generated: "2024-06-03T09:51:56.321676+02:00" diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index cee10d28..ae07f63b 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.11 +version: 5.0.0 appVersion: 29.0.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: @@ -23,14 +23,14 @@ maintainers: email: jeff@billimek.com dependencies: - name: postgresql - version: 12.12.* + version: 15.5.0 repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: mariadb - version: 12.2.* + version: 18.2.0 repository: oci://registry-1.docker.io/bitnamicharts condition: mariadb.enabled - name: redis - version: 17.13.* + version: 19.5.0 repository: oci://registry-1.docker.io/bitnamicharts condition: redis.enabled