From 48ba03a468e651a732ae92f94a0a338e0a36753f Mon Sep 17 00:00:00 2001
From: WrenIX <dev.github@wrenix.eu>
Date: Mon, 5 Feb 2024 08:46:44 +0100
Subject: [PATCH 1/2] fix(ci): add value files for chart-testing

Signed-off-by: WrenIX <dev.github@wrenix.eu>
---
 charts/nextcloud/Chart.yaml                   |  2 +-
 .../nextcloud/ci/ct-all-enabled-values.yaml   | 19 +++++++
 charts/nextcloud/ci/ct-empty-values.yaml      |  0
 charts/nextcloud/ci/ct-specials-values.yaml   | 51 +++++++++++++++++++
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 charts/nextcloud/ci/ct-all-enabled-values.yaml
 create mode 100644 charts/nextcloud/ci/ct-empty-values.yaml
 create mode 100644 charts/nextcloud/ci/ct-specials-values.yaml

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index bb5a2f67..d5d28e2a 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 4.5.19
+version: 4.5.20
 appVersion: 28.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/ci/ct-all-enabled-values.yaml b/charts/nextcloud/ci/ct-all-enabled-values.yaml
new file mode 100644
index 00000000..13133432
--- /dev/null
+++ b/charts/nextcloud/ci/ct-all-enabled-values.yaml
@@ -0,0 +1,19 @@
+metrics:
+  enabled: true
+
+nextcloud:
+  configs:
+    my.config.php: |-
+      <?php
+
+image:
+  flavor: fpm
+nginx:
+  enabled: true
+  config:
+    custom: |-
+      server {
+        listen 8080;
+        server_name tmp-server;
+        root /tmp;
+      }
diff --git a/charts/nextcloud/ci/ct-empty-values.yaml b/charts/nextcloud/ci/ct-empty-values.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/charts/nextcloud/ci/ct-specials-values.yaml b/charts/nextcloud/ci/ct-specials-values.yaml
new file mode 100644
index 00000000..ec901071
--- /dev/null
+++ b/charts/nextcloud/ci/ct-specials-values.yaml
@@ -0,0 +1,51 @@
+metrics:
+  enabled: true
+  image:
+    pullSecrets:
+      - "registry-pull"
+  podAnnotations:
+    fakeVersion: unreleased
+  podLabels:
+    team: cool
+  resources:
+    requests:
+      memory: 100Mi
+  service:
+    type: LoadBalancer
+    loadBalancerIP: 100.64.0.1
+    annotations:
+      fakeVersion: unreleased
+    labels:
+      team: cool
+
+nextcloud:
+  configs:
+    my.config.php: |-
+      <?php
+
+  phpConfigs:
+    redis.ini: |-
+      session.save_handler = redis
+      session.save_path = "tcp://host1:6379?weight=1, tcp://host2:6379?weight=2&timeout=2.5"
+
+image:
+  flavor: fpm
+
+nginx:
+  enabled: true
+  config:
+    default: false
+    # without default chart-testing needs to call /status.php for healthy probe
+    custom: |-
+      upstream php-handler {
+        server 127.0.0.1:9000;
+      }
+      server {
+        listen 80;
+        root /var/www/html;
+        location ~ \.php(?:$|/) {
+          include fastcgi_params;
+          fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+          fastcgi_pass php-handler;
+        }
+      }

From def272e0bc54e26329c206a3c5669ea7a4724f5d Mon Sep 17 00:00:00 2001
From: WrenIX <dev.github@wrenix.eu>
Date: Mon, 5 Feb 2024 08:51:00 +0100
Subject: [PATCH 2/2] fix(ci): add ServiceMonitor to chart-testing

Signed-off-by: WrenIX <dev.github@wrenix.eu>
---
 charts/nextcloud/ci/ct-all-enabled-values.yaml | 2 ++
 charts/nextcloud/ci/ct-specials-values.yaml    | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/charts/nextcloud/ci/ct-all-enabled-values.yaml b/charts/nextcloud/ci/ct-all-enabled-values.yaml
index 13133432..4fc3351f 100644
--- a/charts/nextcloud/ci/ct-all-enabled-values.yaml
+++ b/charts/nextcloud/ci/ct-all-enabled-values.yaml
@@ -1,5 +1,7 @@
 metrics:
   enabled: true
+  serviceMonitor:
+    enabled: true
 
 nextcloud:
   configs:
diff --git a/charts/nextcloud/ci/ct-specials-values.yaml b/charts/nextcloud/ci/ct-specials-values.yaml
index ec901071..f96767e6 100644
--- a/charts/nextcloud/ci/ct-specials-values.yaml
+++ b/charts/nextcloud/ci/ct-specials-values.yaml
@@ -17,6 +17,15 @@ metrics:
       fakeVersion: unreleased
     labels:
       team: cool
+  serviceMonitor:
+    enabled: true
+    namespace: "somewhere-else"
+    labels:
+      prometheus: default
+    interval: "20s"
+    scrapeTimeout: "15s"
+    namespaceSelector:
+      - "default"
 
 nextcloud:
   configs: