Merge branch 'main' into 1080-migrate-jobs-to-poststartcommand

.gitlab-ci.yml

@@ -67,7 +67,8 @@ install-helmrelease:
         >> values-ci.yaml
     - cat values-ci.yaml
     - time kubectl delete --wait=true namespace "nc$CI_MERGE_REQUEST_IID" || true
-    - time helm --debug install --timeout 20m --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml
+    - passgen() { < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c20; }
+    - time helm --debug install --timeout 20m --create-namespace -n nc$CI_MERGE_REQUEST_IID --wait "nc$CI_MERGE_REQUEST_IID" . -f values-ci.yaml --set nextcloud.nextcloud.password=$(passgen),nextcloud.mariadb.auth.password=$(passgen),nextcloud.mariadb.auth.rootPassword=$(passgen),redis.auth.password=$(passgen),onlyoffice.jwtSecret=$(passgen),rabbitmq.auth.password=$(passgen),rabbitmq.auth.erlangCookie=$(passgen),global.onlyofficeDb.password=$(passgen)
   environment:
     name: helmrelease/nc$CI_MERGE_REQUEST_IID
     url: https://files-nc$CI_MERGE_REQUEST_IID.gitlab.stackspin.net

.gitlab/merge_request_templates/DEFAULT.md

@@ -3,6 +3,9 @@ that you:
 
 - [ ] Updated chart version number in `Chart.yaml`
 - [ ] Updated the `CHANGELOG.md`
-- [ ] Manually tested chart changes with the stackspin bootstrap script
+### Test in stackspin/stackspin (if applicable)
+
+If you made very big changes to the chart, you'll want to test whether the chart still works before releasing the new version. To do so, create an MR in the stackspin/stackspin repository, change `flux2/core/base/sources/nextcloud-helmrepository.yaml` to track the `unstable` helm repository, instead of `stable`, and change `flux2/apps/nextcloud/release.yaml` to this MRs chart version.
+
 - [ ] Created an MR in stackspin/stackspin that applies the changes from this MR
 - [ ] Tests in that MR in stackspin/stackspin succeed

CHANGELOG.md

 # Changelog
 
+## [0.14.1] - 2022-10-20
+
+* Remove default passwords in values.yaml and values-local.yaml.example
+
 ## [0.14.0] - 2022-10-18
 
 * Fix helm test when you try to use ssoLogin

Chart.lock

 dependencies:
 - name: nextcloud
   repository: https://nextcloud.github.io/helm
-  version: 3.1.2
+  version: 3.2.0
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 11.0.3
-digest: sha256:b923911f9a522e6c526a0d9938619191e2d1c86e505f0cfd47cfb058fd30387c
-generated: "2022-10-19T22:07:26.59775973Z"
+  version: 11.0.4
+digest: sha256:15bde8f9e0736e7e7c9ca3590df48782ffe1bb22bb7ace07c76a83a87f2d2f0c
+generated: "2022-10-26T02:07:07.720664356Z"

Chart.yaml

@@ -4,14 +4,14 @@ description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
 appVersion: NC-24.0.5-OO-7.2.0.204
-version: 0.14.0
+version: 0.14.2
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 dependencies:
   # https://artifacthub.io/packages/helm/nextcloud/nextcloud
   - name: nextcloud
-    version: 3.1.2
+    version: 3.2.0
     repository: "https://nextcloud.github.io/helm"
   # https://artifacthub.io/packages/helm/bitnami/rabbitmq
   - name: rabbitmq
-    version: 11.0.3
+    version: 11.0.4
     repository: "https://charts.bitnami.com/bitnami"

README.md

@@ -18,15 +18,17 @@ correctly. See `values-local.yaml.example` for an example of domain
 configurations you might want to do. These instructions assume you copy
 `values-local.yaml.example` to `values-local.yaml` and edit it.
 
-**NOTE:** It is very important that you overwrite the following password and
+**NOTE:** It is very important that you uncomment and set the following password and
 secrets variables manually when you run helm install:
 
 - `nextcloud.nextcloud.password`
-- `nextcloud.mariadb.db.password`
-- `nextcloud.mariadb.rootUser.password`
+- `nextcloud.mariadb.auth.password`
+- `nextcloud.mariadb.auth.rootPassword`
+- `redis.auth.password`
 - `onlyoffice.jwtSecret`
-- `onlyoffice.database.password`
-- `rabbitmq.rabbitmq.password`
+- `rabbitmq.auth.password`
+- `rabbitmq.auth.erlangCookie`
+- `global.onlyofficeDb.password`
 
 **NOTE:** The chart currently includes a ConfigMap with a name that is not
 dependent on the release name. This means that the chart cannot be installed

values-local.yaml.example

 nextcloud:
   nextcloud:
     host: "files.your.domain"
-    password: CHANGE_ME
+    # password: CHANGE_ME
 
   ingress:
     enabled: true
@@ -18,9 +18,9 @@ nextcloud:
 
   # Configure MariaDB chart
   mariadb:
-    auth:
-      password: CHANGE_ME
-      rootPassword: CHANGE_ME
+    auth: {}
+      # password: CHANGE_ME
+      # rootPassword: CHANGE_ME
     architecture: standalone
     # Enable persistence
     # primary:
@@ -29,9 +29,9 @@ nextcloud:
     #     enabled: true
     #     size: 512Mi
   redis:
-    auth:
+    auth: {}
       # Shared redis password for Nextcloud and OnlyOffice
-      password: CHANGE_ME
+      # password: CHANGE_ME
 
   # Creates a kubernetes cronJob object that runs nextcloud's cron.php
   # every 5 minutes (*/5 * * * *)
@@ -43,12 +43,12 @@ nextcloud:
   #   size: 2Gi
 
 global:
-  onlyofficeDb:
-    password: CHANGE_ME
+  onlyofficeDb: {}
+    # password: CHANGE_ME
 
 onlyoffice:
   server_name: "office.your.domain"
-  jwtSecret: CHANGE_ME
+  # jwtSecret: CHANGE_ME
   ingress:
     enabled: true
     annotations:
@@ -62,8 +62,8 @@ onlyoffice:
         secretName: office-cert
 
 rabbitmq:
-  auth:
-    password: CHANGE_ME
+  auth: {}
+    # password: CHANGE_ME
 
 # apps controls which apps will be installed and enabled in nextcloud
 # apps:

values.yaml

@@ -82,7 +82,7 @@ global:
     name: onlyoffice
     port: 3306
     user: onlyoffice
-    # password:
+    # password: password
 
 
 onlyoffice:
@@ -90,7 +90,7 @@ onlyoffice:
 
   replicaCount: 1
 
-  jwtSecret: secret
+  # jwtSecret: secret
 
   # Enable font generation during startup.
   # This takes a long time and is not needed if you don't provide custom
@@ -208,9 +208,9 @@ onlyoffice:
     failureThreshold: 120
 
 rabbitmq:
-  auth:
-    password: password
-    erlangCookie: stub
+  auth: {}
+    # password: password
+    # erlangCookie: stub
 
 sociallogin:
   update_profile_on_login: 1
@@ -237,7 +237,7 @@ tests:
   image:
     # https://hub.docker.com/r/cypress/included/tags
     repository: cypress/included
-    tag: 10.10.0
+    tag: 10.11.0
     pullPolicy: IfNotPresent
   ssoLogin:
     # Set this to "true" to use the OIDC plugin to log in in the tests