From 1d2dfe593c8d9dcb11704c2573f5295d001f5532 Mon Sep 17 00:00:00 2001
From: Janikio <janikb@protonmail.com>
Date: Sun, 3 Oct 2021 18:34:47 +0200
Subject: [PATCH 1/2] added namespace to ingress

---
 k8s/helm_charts2/templates/ingress.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/k8s/helm_charts2/templates/ingress.yaml b/k8s/helm_charts2/templates/ingress.yaml
index dcd52c138..4f1b4251d 100644
--- a/k8s/helm_charts2/templates/ingress.yaml
+++ b/k8s/helm_charts2/templates/ingress.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
  name: ingress-{{ template "seaweedfs.name" . }}-filer
+ namespace: {{ .Release.Namespace }}
  annotations:
    kubernetes.io/ingress.class: "nginx"
    nginx.ingress.kubernetes.io/auth-type: "basic"
@@ -32,6 +33,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: ingress-{{ template "seaweedfs.name" . }}-master
+  namespace: {{ .Release.Namespace }}
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/auth-type: "basic"

From ca04c59ac95951b17e6081e681fa35e3ca275038 Mon Sep 17 00:00:00 2001
From: Janikio <janikb@protonmail.com>
Date: Sun, 3 Oct 2021 18:35:04 +0200
Subject: [PATCH 2/2] ignore ServiceMonitor when monitoring is disabled

---
 k8s/helm_charts2/templates/filer-servicemonitor.yaml  | 2 ++
 k8s/helm_charts2/templates/s3-servicemonitor.yaml     | 2 ++
 k8s/helm_charts2/templates/volume-servicemonitor.yaml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/k8s/helm_charts2/templates/filer-servicemonitor.yaml b/k8s/helm_charts2/templates/filer-servicemonitor.yaml
index f07f6ebef..ed45442dc 100644
--- a/k8s/helm_charts2/templates/filer-servicemonitor.yaml
+++ b/k8s/helm_charts2/templates/filer-servicemonitor.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.filer.metricsPort }}
+{{- if .Values.global.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -15,4 +16,5 @@ spec:
   selector:
     app: {{ template "seaweedfs.name" . }}
     component: filer
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/k8s/helm_charts2/templates/s3-servicemonitor.yaml b/k8s/helm_charts2/templates/s3-servicemonitor.yaml
index 7f18f00f5..b549893c7 100644
--- a/k8s/helm_charts2/templates/s3-servicemonitor.yaml
+++ b/k8s/helm_charts2/templates/s3-servicemonitor.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.s3.metricsPort }}
+{{- if .Values.global.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -15,4 +16,5 @@ spec:
   selector:
     app: {{ template "seaweedfs.name" . }}
     component: s3
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/k8s/helm_charts2/templates/volume-servicemonitor.yaml b/k8s/helm_charts2/templates/volume-servicemonitor.yaml
index 1b286e9b6..90d70e8de 100644
--- a/k8s/helm_charts2/templates/volume-servicemonitor.yaml
+++ b/k8s/helm_charts2/templates/volume-servicemonitor.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.volume.metricsPort }}
+{{- if .Values.global.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -15,4 +16,5 @@ spec:
   selector:
     app: {{ template "seaweedfs.name" . }}
     component: volume
+{{- end }}
 {{- end }}
\ No newline at end of file