Browse Source

Merge pull request #2353 from Janikio/chart-patch

pull/2380/head
Chris Lu 3 years ago
committed by GitHub
parent
commit
3799929830
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      k8s/helm_charts2/templates/filer-servicemonitor.yaml
  2. 2
      k8s/helm_charts2/templates/ingress.yaml
  3. 2
      k8s/helm_charts2/templates/s3-servicemonitor.yaml
  4. 2
      k8s/helm_charts2/templates/volume-servicemonitor.yaml

2
k8s/helm_charts2/templates/filer-servicemonitor.yaml

@ -1,4 +1,5 @@
{{- if .Values.filer.metricsPort }} {{- if .Values.filer.metricsPort }}
{{- if .Values.global.monitoring.enabled }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
@ -15,4 +16,5 @@ spec:
selector: selector:
app: {{ template "seaweedfs.name" . }} app: {{ template "seaweedfs.name" . }}
component: filer component: filer
{{- end }}
{{- end }} {{- end }}

2
k8s/helm_charts2/templates/ingress.yaml

@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: ingress-{{ template "seaweedfs.name" . }}-filer name: ingress-{{ template "seaweedfs.name" . }}-filer
namespace: {{ .Release.Namespace }}
annotations: annotations:
kubernetes.io/ingress.class: "nginx" kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/auth-type: "basic" nginx.ingress.kubernetes.io/auth-type: "basic"
@ -32,6 +33,7 @@ apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: ingress-{{ template "seaweedfs.name" . }}-master name: ingress-{{ template "seaweedfs.name" . }}-master
namespace: {{ .Release.Namespace }}
annotations: annotations:
kubernetes.io/ingress.class: "nginx" kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/auth-type: "basic" nginx.ingress.kubernetes.io/auth-type: "basic"

2
k8s/helm_charts2/templates/s3-servicemonitor.yaml

@ -1,4 +1,5 @@
{{- if .Values.s3.metricsPort }} {{- if .Values.s3.metricsPort }}
{{- if .Values.global.monitoring.enabled }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
@ -15,4 +16,5 @@ spec:
selector: selector:
app: {{ template "seaweedfs.name" . }} app: {{ template "seaweedfs.name" . }}
component: s3 component: s3
{{- end }}
{{- end }} {{- end }}

2
k8s/helm_charts2/templates/volume-servicemonitor.yaml

@ -1,4 +1,5 @@
{{- if .Values.volume.metricsPort }} {{- if .Values.volume.metricsPort }}
{{- if .Values.global.monitoring.enabled }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
@ -15,4 +16,5 @@ spec:
selector: selector:
app: {{ template "seaweedfs.name" . }} app: {{ template "seaweedfs.name" . }}
component: volume component: volume
{{- end }}
{{- end }} {{- end }}
Loading…
Cancel
Save