From a949dcd105aa1f6641aa7d41913b249a639db974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Boldi=C5=A1?= Date: Tue, 14 Feb 2023 19:07:58 +0100 Subject: [PATCH 1/6] Add missing namespace selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Richard Boldiš --- charts/nextcloud/templates/metrics-servicemonitor.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/nextcloud/templates/metrics-servicemonitor.yaml b/charts/nextcloud/templates/metrics-servicemonitor.yaml index ba55c38c..bb91b3a3 100644 --- a/charts/nextcloud/templates/metrics-servicemonitor.yaml +++ b/charts/nextcloud/templates/metrics-servicemonitor.yaml @@ -19,6 +19,9 @@ metadata: {{- end }} spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} selector: matchLabels: app.kubernetes.io/name: {{ include "nextcloud.name" . }} From da69b9852d01484f446961f5056cd514be649d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Boldi=C5=A1?= Date: Tue, 14 Feb 2023 19:08:19 +0100 Subject: [PATCH 2/6] Bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Richard Boldiš --- charts/nextcloud/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 229d8a08..9f25f76b 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 3.4.7 +version: 3.4.8 appVersion: 25.0.3 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: From 5d64fabf85a20b619de34fc31de1bdaa5d00b8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Boldi=C5=A1?= Date: Sun, 19 Feb 2023 18:13:06 +0100 Subject: [PATCH 3/6] Bump version to 3.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Richard Boldiš --- charts/nextcloud/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 9f25f76b..0f8e5456 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 3.4.8 +version: 3.5.1 appVersion: 25.0.3 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: From 133923dbafb8b7839f377d059d6edfc4d833f6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Boldi=C5=A1?= Date: Sun, 19 Mar 2023 13:24:04 +0100 Subject: [PATCH 4/6] Match the namespace logic with the block above MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Richard Boldiš --- charts/nextcloud/templates/metrics-servicemonitor.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/nextcloud/templates/metrics-servicemonitor.yaml b/charts/nextcloud/templates/metrics-servicemonitor.yaml index bb91b3a3..1bc91ec7 100644 --- a/charts/nextcloud/templates/metrics-servicemonitor.yaml +++ b/charts/nextcloud/templates/metrics-servicemonitor.yaml @@ -21,7 +21,11 @@ spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }} namespaceSelector: matchNames: - - {{ .Release.Namespace }} + {{- if .Values.metrics.serviceMonitor.namespace }} + - {{ .Values.metrics.serviceMonitor.namespace | quote }} + {{- else }} + - {{ .Release.Namespace | quote }} + {{- end }} selector: matchLabels: app.kubernetes.io/name: {{ include "nextcloud.name" . }} From 31140e67b0cd80a7fd373a83e73edba0a401b01d Mon Sep 17 00:00:00 2001 From: JesseBot Date: Thu, 4 May 2023 15:14:37 +0200 Subject: [PATCH 5/6] bump helm chart version in charts/nextcloud/Chart.yaml Signed-off-by: JesseBot --- charts/nextcloud/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index dec4ee6c..fd28514b 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 3.5.4 +version: 3.5.13 appVersion: 25.0.4 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: From 7de5a9757f38b9225160fb23c2a3f245ab06e66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Boldi=C5=A1?= Date: Thu, 18 May 2023 16:08:35 +0200 Subject: [PATCH 6/6] Tweak formatting --- charts/nextcloud/templates/metrics-servicemonitor.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/nextcloud/templates/metrics-servicemonitor.yaml b/charts/nextcloud/templates/metrics-servicemonitor.yaml index 1bc91ec7..630a1ac6 100644 --- a/charts/nextcloud/templates/metrics-servicemonitor.yaml +++ b/charts/nextcloud/templates/metrics-servicemonitor.yaml @@ -21,11 +21,11 @@ spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }} namespaceSelector: matchNames: - {{- if .Values.metrics.serviceMonitor.namespace }} - - {{ .Values.metrics.serviceMonitor.namespace | quote }} - {{- else }} - - {{ .Release.Namespace | quote }} - {{- end }} + {{- if .Values.metrics.serviceMonitor.namespace }} + - {{ .Values.metrics.serviceMonitor.namespace | quote }} + {{- else }} + - {{ .Release.Namespace | quote }} + {{- end }} selector: matchLabels: app.kubernetes.io/name: {{ include "nextcloud.name" . }}