From 230e4e907d7ba164012ef1260c74103c11547ccb Mon Sep 17 00:00:00 2001
From: switzerchees <patrickmichel96@yahoo.de>
Date: Sat, 10 Feb 2024 17:53:56 +0100
Subject: [PATCH] fix(nextcloud): Add nodeSelector, tolerations and affinity to
 metrics deployment

Signed-off-by: Patrick Michel <patrickmichel96@yahoo.de>
Signed-off-by: switzerchees <patrickmichel96@yahoo.de>
Signed-off-by: WrenIX <dev.github@wrenix.eu>
---
 charts/nextcloud/Chart.yaml                   |  2 +-
 .../templates/metrics/deployment.yaml         | 12 ++++++++
 charts/nextcloud/values.yaml                  | 28 +++++++++++++------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 340fba8b..31b9001b 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 5.5.4
+version: 5.5.5
 appVersion: 29.0.6
 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/templates/metrics/deployment.yaml b/charts/nextcloud/templates/metrics/deployment.yaml
index e6718e93..bbd9a796 100644
--- a/charts/nextcloud/templates/metrics/deployment.yaml
+++ b/charts/nextcloud/templates/metrics/deployment.yaml
@@ -87,4 +87,16 @@ spec:
       securityContext:
         {{- toYaml . | nindent 12 }}
       {{- end }}
+      {{- with .Values.metrics.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.metrics.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.metrics.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 8f44ff98..1d1f93af 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -633,24 +633,34 @@ metrics:
   ## Metrics exporter resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
-  # resources: {}
+  resources: {}
+
+  # -- Metrics exporter pod Annotation
+  podAnnotations: {}
+
+  # -- Metrics exporter pod Labels
+  podLabels: {}
+
+  # -- Metrics exporter pod nodeSelector
+  nodeSelector: {}
 
-  ## Metrics exporter pod Annotation and Labels
-  # podAnnotations: {}
+  # -- Metrics exporter pod tolerations
+  tolerations: []
 
-  # podLabels: {}
+  # -- Metrics exporter pod affinity
+  affinity: {}
 
   service:
     type: ClusterIP
-    ## Use serviceLoadBalancerIP to request a specific static IP,
-    ## otherwise leave blank
-    # loadBalancerIP:
+    # Use serviceLoadBalancerIP to request a specific static IP,
+    # otherwise leave blank
+    loadBalancerIP:
     annotations:
       prometheus.io/scrape: "true"
       prometheus.io/port: "9205"
     labels: {}
 
-  # security context for the metrics CONTAINER in the pod
+  # -- security context for the metrics CONTAINER in the pod
   securityContext:
     runAsUser: 1000
     runAsNonRoot: true
@@ -659,7 +669,7 @@ metrics:
     #   drop:
     #     - ALL
 
-  # security context for the metrics POD
+  # -- security context for the metrics POD
   podSecurityContext: {}
   # runAsNonRoot: true
   # seccompProfile: