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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 ba6ce9d9d1d1d1e1cb8ff94931420e4a392a0bc8 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Wed, 29 May 2024 15:58:53 +0200 Subject: [PATCH 5/7] 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 6/7] 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 7/7] 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