Merge branch 'allow-nginx-additional-config' of github.com:solution-l…

…ibre/helm into allow-nginx-additional-config

.github/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,25 @@
+---
+name: "Enhancement"
+about: "Suggest an enhancement for this project ✨"
+title: "Feature: A cool new feature..."
+labels: "enhancement"
+assignees: ''
+
+---
+## Description of the change
+
+<!-- Describe the scope of your change - i.e. what the change does. -->
+
+## Benefits
+
+<!-- What benefits will be realized by the code change? -->
+
+## Possible drawbacks
+
+<!-- Describe any known limitations with your change -->
+
+## Additional information
+
+<!-- If there's anything else that's important and relevant to your pull request, mention that information here. -->
+
+<!-- Thanks for submitting an enhancement! Please consider also submitting a pull request for your suggestion :) -->

.github/ISSUE_TEMPLATE/issue.md

@@ -0,0 +1,34 @@
+---
+name: "General Issue"
+about: "Create an issue to report something not working."
+title: "A descriptive title of the issue"
+labels: ''
+assignees: ''
+
+---
+
+## Describe your Issue
+<!-- A clear and concise description of what the issue or bug is -->
+
+### Logs and Errors
+<!-- Give us any errors you're getting -->
+<!-- Let us know where you got the log, e.g. nextcloud container or nginx container -->
+<!-- You can get the pod logs with: `kubectl logs` (remove any sensitive data ahead of time) -->
+
+## Describe your Environment
+
+- Kubernetes distribution: <!-- examples: k3s, k0s, eks, gke -->
+
+- Helm Version (or App that manages helm): <!-- example: Using helm version 3.11, or include data about what is running helm, e.g. ArgoCD version 2.5.8 -->
+
+- Helm Chart Version: <!-- example: 3.4.3 -->
+
+- `values.yaml`:
+
+```yaml
+# paste your values.yaml (anonymize any sensitive data)
+```
+
+## Additional context, if any
+<!-- Also note any additional relevant info about your environment. -->
+<!-- example: If your issue is related to persistent volumes, let us know you're using NFS or EFS, for instance. -->

.github/dependabot.yml

@@ -1,7 +1,7 @@
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
-# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
 updates:
@@ -10,3 +10,8 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every weekday
       interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/charts/nextcloud"
+    schedule:
+      interval: "daily"

.github/workflows/lint-test.yaml

@@ -3,9 +3,11 @@ name: Lint and Test Charts
 on:
   pull_request:
     paths-ignore:
-      - 'README.md'
+      - '.github/**'
       - 'charts/**/README.md'
+      - 'CODE_OF_CONDUCT.md'
       - 'LICENSE'
+      - 'README.md'
 
 jobs:
   lint-test:
@@ -14,40 +16,38 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0        
+          fetch-depth: 0
 
       - name: Install Helm
-        uses: azure/setup-helm@v3.1
+        uses: azure/setup-helm@v3.5
         with:
-          version: v3.6.3
+          version: v3.11.1
 
       - 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.3.1
+        uses: helm/chart-testing-action@v2.4.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
-          changed=$(ct list-changed)
+          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
+            echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Run chart-testing (lint)
         id: lint
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct lint --config ct.yaml
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
 
       - name: Create kind cluster
-        uses: helm/[email protected]
-        with:
-          install_local_path_provisioner: true
+        uses: helm/[email protected]
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Run chart-testing (install)
         id: install
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --config ct.yaml
+        run: ct install --target-branch ${{ github.event.repository.default_branch }}

.github/workflows/release.yaml

@@ -4,11 +4,12 @@ name: Release Charts
 on:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
-      - 'README.md'
+      - '.github/**'
       - 'charts/**/README.md'
       - 'LICENSE'
+      - 'README.md'
 
 jobs:
   release:
@@ -34,17 +35,15 @@ jobs:
 
       # See https://github.com/helm/chart-releaser-action/issues/6
       - name: Set up Helm
-        uses: azure/setup-helm@v3.1
+        uses: azure/setup-helm@v3.5
         with:
-          version: v3.6.3
+          version: v3.11.1
 
       - name: Add dependency chart repos
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
       - name: Run chart-releaser
-        uses: helm/[email protected]
-        with:
-          charts_repo_url: https://nextcloud.github.io/helm
+        uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
+In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.
+
+Our code of conduct offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
+
+The Code of Conduct is shared by all contributors and users who engage with the Nextcloud team and its community services. It presents a summary of the shared values and “common sense” thinking in our community.
+
+You can find our full code of conduct on our website: https://nextcloud.com/code-of-conduct/
+
+Please, keep our CoC in mind when you contribute! That way, everyone can be a part of our community in a productive, positive, creative and fun way.

README.md

@@ -18,3 +18,17 @@ helm repo update
   ```bash
   helm install my-release nextcloud/nextcloud
   ```
+
+For more information, please checkout the chart level [README.md](./charts/nextcloud/README.md).
+
+### Support and Contribution
+Please also review the official [NextCloud Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/) before contributing.
+
+#### Questions and Discussions
+[GitHub Discussion](https://github.com/nextcloud/helm/discussions)
+
+#### Bugs and other Issues
+If you have a bug to report or a feature to request, you can first search the [GitHub Issues](https://github.com/nextcloud/helm/issues), and  if you can't find what you're looking for, feel free to open an issue.
+
+#### Contributing to the Code
+We're always happy to review a pull request :) Please just be sure to check the pull request template to make sure you fufill all the required checks, most importantly the [DCO](https://probot.github.io/apps/dco/).

charts/nextcloud/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 11.6.10
+  version: 11.6.26
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 11.0.13
+  version: 11.0.14
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 16.12.3
-digest: sha256:fa5daab278b20ab0521819791750848c7cf8f4081bea4d675ce04faef5cbb547
-generated: "2022-06-28T20:46:18.681579184+02:00"
+digest: sha256:26d3436ece41f0fbe00d0184c1cda7f5cccb7d49642982cfff49f113c11c0f34
+generated: "2022-10-30T11:48:19.745391397+01:00"

charts/nextcloud/Chart.yaml

@@ -1,36 +1,36 @@
 apiVersion: v2
 name: nextcloud
-version: 3.2.3
-appVersion: 24.0.5
+version: 3.5.12
+appVersion: 26.0.1
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
-- nextcloud
-- storage
-- http
-- web
-- php
+  - nextcloud
+  - storage
+  - http
+  - web
+  - php
 home: https://nextcloud.com/
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 sources:
-- https://github.com/nextcloud/helm
-- https://github.com/nextcloud/docker
+  - https://github.com/nextcloud/helm
+  - https://github.com/nextcloud/docker
 maintainers:
-- name: skjnldsv
-  email: [email protected]
-- name: chrisingenhaag
-  email: [email protected]
-- name: billimek
-  email: [email protected]
+  - name: skjnldsv
+    email: [email protected]
+  - name: chrisingenhaag
+    email: [email protected]
+  - name: billimek
+    email: [email protected]
 dependencies:
-- name: postgresql
-  version: 11.6.*
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: mariadb
-  version: 11.0.*
-  repository: https://charts.bitnami.com/bitnami
-  condition: mariadb.enabled
-- name: redis
-  version: 16.12.*
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
+  - name: postgresql
+    version: 11.6.*
+    repository: https://charts.bitnami.com/bitnami
+    condition: postgresql.enabled
+  - name: mariadb
+    version: 11.0.*
+    repository: https://charts.bitnami.com/bitnami
+    condition: mariadb.enabled
+  - name: redis
+    version: 16.12.*
+    repository: https://charts.bitnami.com/bitnami
+    condition: redis.enabled