From b24933bc7fc076ffef38bafbde7bba1d43d7ea78 Mon Sep 17 00:00:00 2001 From: Yonggan Date: Thu, 31 Oct 2024 00:00:05 +0100 Subject: [PATCH 01/14] Add: Missing targetRevision in manyfold.yaml in applications --- applications/manyfold.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/manyfold.yaml b/applications/manyfold.yaml index 0e8ec15..48c81ae 100644 --- a/applications/manyfold.yaml +++ b/applications/manyfold.yaml @@ -9,6 +9,7 @@ spec: sources: - chart: redis repoURL: https://bitnami-labs.github.io/redis + targetRevision: 20.2.1 helm: releaseName: redis - path: manifests/manyfold From 5bd4c36f443351339affd52aa10c2167426383a7 Mon Sep 17 00:00:00 2001 From: Yonggan Date: Thu, 31 Oct 2024 00:05:40 +0100 Subject: [PATCH 02/14] Fix bitnami redis url --- applications/manyfold.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/manyfold.yaml b/applications/manyfold.yaml index 48c81ae..1a1db16 100644 --- a/applications/manyfold.yaml +++ b/applications/manyfold.yaml @@ -8,7 +8,7 @@ spec: server: "https://kubernetes.default.svc" sources: - chart: redis - repoURL: https://bitnami-labs.github.io/redis + repoURL: https://charts.bitnami.com/bitnami/ targetRevision: 20.2.1 helm: releaseName: redis From c0cce850eeeaffd4f3cd020d33a986e3511b9698 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 00:08:33 +0100 Subject: [PATCH 03/14] Update manyfold.yaml --- applications/manyfold.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/manyfold.yaml b/applications/manyfold.yaml index 48c81ae..d4e09ed 100644 --- a/applications/manyfold.yaml +++ b/applications/manyfold.yaml @@ -8,7 +8,7 @@ spec: server: "https://kubernetes.default.svc" sources: - chart: redis - repoURL: https://bitnami-labs.github.io/redis + repoURL: "https://charts.bitnami.com/bitnami/" targetRevision: 20.2.1 helm: releaseName: redis From 8bc8c957804ad45aee855f74a33aa8f8edc39f40 Mon Sep 17 00:00:00 2001 From: Yonggan Date: Thu, 31 Oct 2024 12:46:16 +0100 Subject: [PATCH 04/14] Fix env --- manifests/manyfold/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index ad9097d..92666f6 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -23,7 +23,7 @@ spec: volumeMounts: - mountPath: "/libraries" name: manyfold-libraries - environment: + env: - name: PUID value: "1000" - name: PGID From 3fa3159f3c60a6dae56d2871420f7fabf32d7099 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:47:28 +0100 Subject: [PATCH 05/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index ad9097d..92666f6 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -23,7 +23,7 @@ spec: volumeMounts: - mountPath: "/libraries" name: manyfold-libraries - environment: + env: - name: PUID value: "1000" - name: PGID From c6716af539e426fe70bc87f4b3e66537d73497c7 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 12:57:59 +0100 Subject: [PATCH 06/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 92666f6..38bb4aa 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -53,6 +53,6 @@ spec: name: db-app key: password - name: REDIS_URL - value: redis://redis-master:6379/1 + value: redis://default:A36B6jX4BG/@redis-master:6379/1 volumes: - name: manyfold-libraries From ebbb61b6eb5f31a9bf3e02cda1238fa3eae8428c Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:18:18 +0100 Subject: [PATCH 07/14] Multiuser --- manifests/manyfold/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 38bb4aa..565f7d1 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -54,5 +54,7 @@ spec: key: password - name: REDIS_URL value: redis://default:A36B6jX4BG/@redis-master:6379/1 + - name: MULTIUSER + value: "enabled" volumes: - name: manyfold-libraries From 501de7a6aacf5d49d261f391d960532a0c11c231 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:19:24 +0100 Subject: [PATCH 08/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 565f7d1..96aef35 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -56,5 +56,7 @@ spec: value: redis://default:A36B6jX4BG/@redis-master:6379/1 - name: MULTIUSER value: "enabled" + - name: FEDERATION + value: "enabled" volumes: - name: manyfold-libraries From 0b7b65b0875e557fe02abd95e0d307980ad9c6e3 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:22:07 +0100 Subject: [PATCH 09/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 96aef35..ea853f1 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -46,7 +46,7 @@ spec: valueFrom: secretKeyRef: name: db-app - key: pgpass + key: password - name: SECRET_KEY_BASE valueFrom: secretKeyRef: @@ -58,5 +58,7 @@ spec: value: "enabled" - name: FEDERATION value: "enabled" + - name: SITE_NAME + value: "Openlab Augsburgs Manfold" volumes: - name: manyfold-libraries From 2620104e16ba706dc5a34757dff8defa892ad4de Mon Sep 17 00:00:00 2001 From: Yonggan Date: Thu, 7 Nov 2024 22:23:33 +0100 Subject: [PATCH 10/14] Fix manyfold finally --- manifests/manyfold/deployment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 92666f6..820b6c8 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -46,13 +46,14 @@ spec: valueFrom: secretKeyRef: name: db-app - key: pgpass + key: password - name: SECRET_KEY_BASE valueFrom: secretKeyRef: name: db-app key: password - name: REDIS_URL - value: redis://redis-master:6379/1 + value: "redis://redis-master:6379/1" volumes: - name: manyfold-libraries + storageClassName: "openebs-hostpath" From 53f9d6edd95c698f364657f44f5a9ec47f5518cb Mon Sep 17 00:00:00 2001 From: Yonggan Date: Thu, 7 Nov 2024 22:24:50 +0100 Subject: [PATCH 11/14] Fix Bitnami repoUrl --- applications/manyfold.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/applications/manyfold.yaml b/applications/manyfold.yaml index 6f6e8f5..d4e09ed 100644 --- a/applications/manyfold.yaml +++ b/applications/manyfold.yaml @@ -8,11 +8,7 @@ spec: server: "https://kubernetes.default.svc" sources: - chart: redis -<<<<<<< HEAD - repoURL: https://charts.bitnami.com/bitnami/ -======= repoURL: "https://charts.bitnami.com/bitnami/" ->>>>>>> k8s/main targetRevision: 20.2.1 helm: releaseName: redis From c518b7cb22d97ad14110e1bea1cdc888e6939de9 Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:27:14 +0100 Subject: [PATCH 12/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index ea853f1..4d6226d 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -62,3 +62,5 @@ spec: value: "Openlab Augsburgs Manfold" volumes: - name: manyfold-libraries + storageClassName: "openebs-hostpath" + From 88b3fbfb6808ef13d34e2413f349357b8c916f7a Mon Sep 17 00:00:00 2001 From: Yonggan <30302975+Y0ngg4n@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:33:33 +0100 Subject: [PATCH 13/14] Update deployment.yaml --- manifests/manyfold/deployment.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 4d6226d..6828610 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -60,7 +60,12 @@ spec: value: "enabled" - name: SITE_NAME value: "Openlab Augsburgs Manfold" - volumes: - - name: manyfold-libraries - storageClassName: "openebs-hostpath" + volumeClaimTemplates: + - metadata: + name: manyfold-libraries + spec: + accessModes: ["ReadWriteMany"] + resources: + requests: + storage: 1Gi From 5458076bd98e00596873063af2b191e620a86483 Mon Sep 17 00:00:00 2001 From: Yonggan Date: Sat, 9 Nov 2024 17:31:18 +0100 Subject: [PATCH 14/14] Fix typo --- manifests/manyfold/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/manyfold/deployment.yaml b/manifests/manyfold/deployment.yaml index 14392e1..8bf536e 100644 --- a/manifests/manyfold/deployment.yaml +++ b/manifests/manyfold/deployment.yaml @@ -60,7 +60,7 @@ spec: - name: FEDERATION value: "enabled" - name: SITE_NAME - value: "Openlab Augsburgs Manfold" + value: "Openlab Augsburgs Manyfold" volumeClaimTemplates: - metadata: