From 0e3c1bf83a6d79999b46ac32daa470cb5a55a384 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Tue, 22 Feb 2022 17:14:08 +0100
Subject: [PATCH] Upgrade nextcloud chart, replacing postgres by mariadb
---
.../nextcloud/nextcloud-values-configmap.yaml | 22 +++----------------
flux2/apps/nextcloud/pvc.yaml | 16 --------------
flux2/apps/nextcloud/release.yaml | 2 +-
flux2/core/base/sources/nextcloud.yaml | 2 +-
.../stackspin-nextcloud-variables.yaml.jinja | 2 +-
5 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index 0fea5d02b..10c4ea429 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -91,7 +91,7 @@ data:
# Let the backup system include nextcloud database data.
backup.velero.io/backup-volumes: "data"
persistence:
- ## Enable PostgreSQL persistence using Persistent Volume Claims.
+ ## Enable mariadb persistence using Persistent Volume Claims.
enabled: true
existingClaim: "nextcloud-mariadb"
resources:
@@ -147,6 +147,8 @@ data:
persistence:
enabled: true
existingClaim: "nextcloud-onlyoffice-data"
+ database:
+ password: "${onlyoffice_database_password}"
deploymentLabels:
stackspin.net/backupSet: "nextcloud"
podLabels:
@@ -154,24 +156,6 @@ data:
podAnnotations:
backup.velero.io/backup-volumes: "onlyoffice-data"
- postgresql:
- postgresqlPassword: "${onlyoffice_postgresql_password}"
- resources:
- limits:
- cpu: 400m
- memory: 256Mi
- requests:
- cpu: 200m
- memory: 128Mi
- persistence:
- enabled: true
- existingClaim: "nextcloud-postgresql"
- primary:
- podAnnotations:
- backup.velero.io/backup-volumes: "data"
- commonLabels:
- stackspin.net/backupSet: "nextcloud"
-
rabbitmq:
auth:
password: "${onlyoffice_rabbitmq_password}"
diff --git a/flux2/apps/nextcloud/pvc.yaml b/flux2/apps/nextcloud/pvc.yaml
index c64feb121..885b91c7c 100644
--- a/flux2/apps/nextcloud/pvc.yaml
+++ b/flux2/apps/nextcloud/pvc.yaml
@@ -33,22 +33,6 @@ spec:
---
apiVersion: v1
kind: PersistentVolumeClaim
-metadata:
- name: nextcloud-postgresql
- namespace: stackspin-apps
- labels:
- stackspin.net/backupSet: "nextcloud"
-spec:
- accessModes:
- - ReadWriteOnce
- volumeMode: Filesystem
- resources:
- requests:
- storage: 512Mi
- storageClassName: local-path
----
-apiVersion: v1
-kind: PersistentVolumeClaim
metadata:
name: nextcloud-onlyoffice-data
namespace: stackspin-apps
diff --git a/flux2/apps/nextcloud/release.yaml b/flux2/apps/nextcloud/release.yaml
index e9e3e7de9..a22e59a74 100644
--- a/flux2/apps/nextcloud/release.yaml
+++ b/flux2/apps/nextcloud/release.yaml
@@ -10,7 +10,7 @@ spec:
spec:
# renovate: registryUrl=https://open.greenhost.net/api/v4/projects/1/packages/helm/stable
chart: nextcloud-onlyoffice
- version: 0.6.7
+ version: 0.7.1
sourceRef:
kind: HelmRepository
name: nextcloud
diff --git a/flux2/core/base/sources/nextcloud.yaml b/flux2/core/base/sources/nextcloud.yaml
index fc4f46a05..008c9acbe 100644
--- a/flux2/core/base/sources/nextcloud.yaml
+++ b/flux2/core/base/sources/nextcloud.yaml
@@ -8,4 +8,4 @@ spec:
# The interval at which to check the upstream for updates
interval: 1h
# The repository URL, can be a HTTP/S or SSH address
- url: https://open.greenhost.net/api/v4/projects/1/packages/helm/stable
+ url: https://open.greenhost.net/api/v4/projects/1/packages/helm/unstable
diff --git a/install/templates/stackspin-nextcloud-variables.yaml.jinja b/install/templates/stackspin-nextcloud-variables.yaml.jinja
index 59adddfcf..824749fd5 100644
--- a/install/templates/stackspin-nextcloud-variables.yaml.jinja
+++ b/install/templates/stackspin-nextcloud-variables.yaml.jinja
@@ -7,6 +7,6 @@ data:
nextcloud_password: "{{ 32 | generate_password | b64encode }}"
nextcloud_mariadb_password: "{{ 32 | generate_password | b64encode }}"
nextcloud_mariadb_root_password: "{{ 32 | generate_password | b64encode }}"
+ onlyoffice_database_password: "{{ 32 | generate_password | b64encode }}"
onlyoffice_jwt_secret: "{{ 32 | generate_password | b64encode }}"
- onlyoffice_postgresql_password: "{{ 32 | generate_password | b64encode }}"
onlyoffice_rabbitmq_password: "{{ 32 | generate_password | b64encode }}"
--
GitLab