Merge branch 'main' into metrics-security-context

nextcloud · Jun 3, 2024 · a7fbffe · a7fbffe
2 parents b1314d5 + 5bde14f
commit a7fbffe
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 15 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -2,27 +2,39 @@ 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
         with:
           fetch-depth: 0
 
       - name: Install Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
-          version: v3.11.1
+          version: v3.14.4
 
       - name: Add dependency chart repos
         run: |
@@ -45,7 +57,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)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,9 +28,9 @@ 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
+          version: v3.14.4
 
       - name: Add dependency chart repos
         run: |

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nextcloud
-version: 4.6.8
-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

diff --git 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
@@ -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
@@ -245,6 +245,11 @@ nginx:
   #   runAsNonRoot: true
   #   readOnlyRootFilesystem: true
 
+  ## Extra environment variables
+  extraEnv: []
+  #  - name: SOME_ENV
+  #    value: ENV_VALUE
+
 internalDatabase:
   enabled: true
   name: nextcloud