Merge branch 'main' into feat/notify_push

Signed-off-by: Jesse Hitch <jessebot@linux.com>

Author: jessebot

.github/pull_request_template.md

@@ -1,5 +1,3 @@
-# Pull Request
-
 ## Description of the change
 
 <!-- Describe the scope of your change - i.e. what the change does. -->
@@ -23,6 +21,7 @@
 
 ## Checklist <!-- [Place an '[X]' (no spaces) in all applicable fields. Please remove unrelated fields.] -->
 
+- [ ] I have read the [CONTRIBUTING.md](https://github.com/nextcloud/helm/blob/main/CONTRIBUTING.md#pull-requests) doc.
 - [ ] DCO has been [signed off on the commit](https://docs.github.com/en/github/authenticating-to-github/signing-commits).
 - [ ] Chart version bumped in `Chart.yaml` according to [semver](http://semver.org/).
-- [ ] (optional) Variables are documented in the README.md
+- [ ] (optional) Parameters are documented in the README.md

.github/workflows/lint-test.yaml

@@ -22,7 +22,7 @@ jobs:
               - 'charts/nextcloud/templates/**'
 
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest-low
     needs: changes
     if: needs.changes.outputs.src != 'false'
     steps:
@@ -56,10 +56,32 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --target-branch ${{ github.event.repository.default_branch }}
 
-  test-internal-database:
+  run-tests:
     runs-on: ubuntu-22.04
     needs: [changes, lint]
+    # only run this job if there are helm chart file changes
     if: needs.changes.outputs.src != 'false'
+    strategy:
+      # continue with all the other jobs even if one fails
+      fail-fast: false
+      matrix:
+        # each item in this list is a job with an isolated test VM
+        test_cases:
+          # test the plain helm chart with nothing changed
+          - name: 'Default - no custom values'
+
+          # test the helm chart with postgresql subchart enabled
+          - name: PostgreSQL Enabled
+            helm_args: '--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=testing12345"'
+
+          # test the helm chart with nginx container enabled
+          - name: Nginx Enabled
+            helm_args: '--helm-extra-set-args "--set=image.flavor=fpm --set=nginx.enabled=true"'
+
+          # test the helm chart with horizontal pod autoscaling enabled
+          - name: Horizontal Pod Autoscaling Enabled
+            helm_args: '--helm-extra-set-args "--set=hpa.enabled=true --set=hpa.minPods=2 --set=hpa.maxPods=3 --set=hpa.targetCPUUtilizationPercentage=75"'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -90,48 +112,15 @@ jobs:
         uses: helm/kind-action@v1.10.0
         if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Run chart-testing (install)
+      - name: Run chart-testing (install ${{ matrix.test_cases.name }})
         id: install
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --target-branch ${{ github.event.repository.default_branch }}
+        run: ct install --target-branch ${{ github.event.repository.default_branch }} ${{ matrix.test_cases.helm_args }}
 
-  test-postgresql-database:
-    runs-on: ubuntu-22.04
-    needs: [changes, lint]
-    if: needs.changes.outputs.src != 'false'
+  summary:
+    runs-on: ubuntu-latest-low
+    needs: [changes, run-tests]
+    if: always()
     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"
+      - name: Summary
+        run: if ${{ needs.changes.outputs.src != 'false' && needs.run-tests.result != 'success' }}; then exit 1; fi

charts/nextcloud/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nextcloud
-version: 5.3.0
-appVersion: 29.0.3
+version: 5.4.0
+appVersion: 29.0.4
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
   - nextcloud

charts/nextcloud/README.md

@@ -22,15 +22,24 @@ helm install my-release nextcloud/nextcloud
 * [Cron jobs](#cron-jobs)
 * [Multiple config.php file](#multiple-configphp-file)
 * [Using nginx](#using-nginx)
+    * [Service discovery with nginx and ingress](#service-discovery-with-nginx-and-ingress)
 * [Preserving Source IP](#preserving-source-ip)
 * [Hugepages](#hugepages)
 * [HPA (Clustering)](#hpa-clustering)
+* [Adjusting PHP ini values](#adjusting-php-ini-values)
 * [Running `occ` commands](#running-occ-commands)
     * [Putting Nextcloud into maintanence mode](#putting-nextcloud-into-maintanence-mode)
     * [Downloading models for recognize](#downloading-models-for-recognize)
 * [Backups](#backups)
 * [Upgrades](#upgrades)
 * [Troubleshooting](#troubleshooting)
+    * [Logging](#logging)
+        * [Changing the logging behavior](#changing-the-logging-behavior)
+        * [Viewing the logs](#viewing-the-logs)
+            * [Exec into the kubernetes pod:](#exec-into-the-kubernetes-pod)
+            * [Then look for the `nextcloud.log` file with tail or cat:](#then-look-for-the-nextcloudlog-file-with-tail-or-cat)
+            * [Copy the log file to your local machine:](#copy-the-log-file-to-your-local-machine)
+        * [Sharing the logs](#sharing-the-logs)
 
 ## Introduction
 
@@ -194,14 +203,15 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `startupProbe.timeoutSeconds`                              | When the probe times out                                                                            | `5`                        |
 | `startupProbe.failureThreshold`                            | Minimum consecutive failures for the probe                                                          | `30`                       |
 | `startupProbe.successThreshold`                            | Minimum consecutive successes for the probe                                                         | `1`                        |
-| `hpa.enabled`                                              | Boolean to create a HorizontalPodAutoscaler                                                         | `false`                    |
+| `hpa.enabled`                                              | Boolean to create a HorizontalPodAutoscaler. If set to `true`, ignores `replicaCount`.              | `false`                    |
 | `hpa.cputhreshold`                                         | CPU threshold percent for the HorizontalPodAutoscale                                                | `60`                       |
 | `hpa.minPods`                                              | Min. pods for the Nextcloud HorizontalPodAutoscaler                                                 | `1`                        |
 | `hpa.maxPods`                                              | Max. pods for the Nextcloud HorizontalPodAutoscaler                                                 | `10`                       |
 | `deploymentLabels`                                         | Labels to be added at 'deployment' level                                                            | not set                    |
 | `deploymentAnnotations`                                    | Annotations to be added at 'deployment' level                                                       | not set                    |
 | `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                                                           | `{}`                       |
 
 
 ### Database Configurations
@@ -494,6 +504,20 @@ persistence:
   accessMode: ReadWriteMany
 ```
 
+## Adjusting PHP ini values
+
+Sometimes you may need special [`php.ini`](https://www.php.net/manual/en/ini.list.php) values. For instance, perhaps your setup requires a bit more memory. You can add additional `php.ini` files in the values.yaml by providing `nextcloud.phpConfigs.NAME_OF_FILE`. Here's an examples:
+
+```yaml
+nextcloud:
+  phpConfigs:
+    zz-memory_limit.ini: |-
+      memory_limit=512M
+```
+
+> [!Note]
+> Be sure to prefix your file name with `zz` to ensure it is loaded at the end.
+
 
 ## Running `occ` commands
 Sometimes you need to run an [occ](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) command on the Nextcloud container directly. You can do that by running commands as the user `www-data` via the `kubectl exec` command.

charts/nextcloud/files/defaultConfigs/.htaccess.tpl

@@ -0,0 +1,12 @@
+# line below if for Apache 2.4
+<ifModule mod_authz_core.c>
+Require all denied
+</ifModule>
+# line below if for Apache 2.2
+<ifModule !mod_authz_core.c>
+deny from all
+</ifModule>
+# section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
+IndexIgnore *
+</ifModule>

charts/nextcloud/files/defaultConfigs/apache-pretty-urls.config.php.tpl

@@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+  'htaccess.RewriteBase' => '/',
+);

charts/nextcloud/files/defaultConfigs/apcu.config.php.tpl

@@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+  'memcache.local' => '\OC\Memcache\APCu',
+);

charts/nextcloud/files/defaultConfigs/apps.config.php.tpl

@@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  "apps_paths" => array (
+      0 => array (
+              "path"     => OC::$SERVERROOT."/apps",
+              "url"      => "/apps",
+              "writable" => false,
+      ),
+      1 => array (
+              "path"     => OC::$SERVERROOT."/custom_apps",
+              "url"      => "/custom_apps",
+              "writable" => true,
+      ),
+  ),
+);

charts/nextcloud/files/defaultConfigs/autoconfig.php.tpl

@@ -0,0 +1,24 @@
+<?php
+$autoconfig_enabled = false;
+if (getenv('SQLITE_DATABASE')) {
+    $AUTOCONFIG["dbtype"] = "sqlite";
+    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $autoconfig_enabled = true;
+} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
+    $AUTOCONFIG["dbtype"] = "mysql";
+    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
+    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $autoconfig_enabled = true;
+} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
+    $AUTOCONFIG["dbtype"] = "pgsql";
+    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
+    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
+    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $autoconfig_enabled = true;
+}
+if ($autoconfig_enabled) {
+    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+}

charts/nextcloud/files/defaultConfigs/redis.config.php.tpl

@@ -0,0 +1,14 @@
+<?php
+if (getenv('REDIS_HOST')) {
+  $CONFIG = array (
+    'memcache.distributed' => '\OC\Memcache\Redis',
+    'memcache.locking' => '\OC\Memcache\Redis',
+    'redis' => array(
+      'host' => getenv('REDIS_HOST'),
+      'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+      {{- if .Values.redis.auth.enabled }}
+      'password' => getenv('REDIS_HOST_PASSWORD'),
+      {{- end }}
+    ),
+  );
+}