Skip to content

S
system-charts
Commit b7cebf42 by Frank Mai Committed by Craig Jellick
Options

Support random serviceSelectorLabels label name

**Problem:** Cannot input like `x.y.z/k` label name into serviceSelectorLabels **Solution:** Use array instead of object as values
parent f8057dbb
Showing with 156 additions and 27 deletions
charts/rancher-monitoring/v0.0.2/charts/exporter-coredns/templates/service.yaml
...@@ -6,7 +6,14 @@ metadata: ...@@ -6,7 +6,14 @@ metadata:
chart: {{ template "app.version" . }} chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
name: expose-coredns-metrics name: expose-coredns-metrics
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
...@@ -19,5 +26,12 @@ spec: ...@@ -19,5 +26,12 @@ spec:
targetPort: {{ .Values.ports.metrics.port }} targetPort: {{ .Values.ports.metrics.port }}
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
selector: selector:
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- end }} {{- end }}
\ No newline at end of file
charts/rancher-monitoring/v0.0.2/charts/exporter-coredns/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-fluentd/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- cattle-logging - cattle-logging
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-controller-manager/templates/service.yaml
...@@ -6,7 +6,14 @@ metadata: ...@@ -6,7 +6,14 @@ metadata:
chart: {{ template "app.version" . }} chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
name: expose-kube-cm-metrics name: expose-kube-cm-metrics
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
...@@ -19,5 +26,12 @@ spec: ...@@ -19,5 +26,12 @@ spec:
targetPort: {{ .Values.ports.metrics.port }} targetPort: {{ .Values.ports.metrics.port }}
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
selector: selector:
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- end }} {{- end }}
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-controller-manager/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-dns/templates/service.yaml
...@@ -6,7 +6,14 @@ metadata: ...@@ -6,7 +6,14 @@ metadata:
chart: {{ template "app.version" . }} chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
name: expose-kube-dns-metrics name: expose-kube-dns-metrics
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
...@@ -23,5 +30,12 @@ spec: ...@@ -23,5 +30,12 @@ spec:
targetPort: {{ .Values.ports.metrics.skydns.port }} targetPort: {{ .Values.ports.metrics.skydns.port }}
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
selector: selector:
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- end }} {{- end }}
\ No newline at end of file
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-dns/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-etcd/templates/service.yaml
...@@ -6,7 +6,14 @@ metadata: ...@@ -6,7 +6,14 @@ metadata:
chart: {{ template "app.version" . }} chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
name: expose-kube-etcd-metrics name: expose-kube-etcd-metrics
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
...@@ -19,5 +26,12 @@ spec: ...@@ -19,5 +26,12 @@ spec:
targetPort: {{ .Values.ports.metrics.port }} targetPort: {{ .Values.ports.metrics.port }}
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
selector: selector:
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- end }} {{- end }}
\ No newline at end of file
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-etcd/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/templates/service.yaml
...@@ -6,7 +6,14 @@ metadata: ...@@ -6,7 +6,14 @@ metadata:
chart: {{ template "app.version" . }} chart: {{ template "app.version" . }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
name: expose-kube-scheduler-metrics name: expose-kube-scheduler-metrics
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
spec: spec:
...@@ -19,5 +26,12 @@ spec: ...@@ -19,5 +26,12 @@ spec:
targetPort: {{ .Values.ports.metrics.port }} targetPort: {{ .Values.ports.metrics.port }}
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
selector: selector:
{{ toYaml .Values.serviceSelectorLabels | indent 4 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- end }} {{- end }}
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-scheduler/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
{{- if not .Values.endpoints }} {{- if not .Values.endpoints }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kubelets/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace | quote }} - {{ .Release.Namespace | quote }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kubernetes/templates/servicemonitor.yaml
...@@ -11,7 +11,14 @@ metadata: ...@@ -11,7 +11,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{ toYaml .Values.serviceSelectorLabels | indent 6 }} {{- range .Values.serviceSelectorLabels }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- "default" - "default"
......
charts/rancher-monitoring/v0.0.2/values.yaml
...@@ -39,7 +39,7 @@ exporter-coredns: ...@@ -39,7 +39,7 @@ exporter-coredns:
port: 9153 port: 9153
protocol: TCP protocol: TCP
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: kube-dns - "k8s-app=kube-dns"
insecureSkipVerify: true insecureSkipVerify: true
exporter-kube-controller-manager: exporter-kube-controller-manager:
...@@ -53,7 +53,7 @@ exporter-kube-controller-manager: ...@@ -53,7 +53,7 @@ exporter-kube-controller-manager:
port: 10252 port: 10252
protocol: TCP protocol: TCP
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: kube-controller-manager - "k8s-app=kube-controller-manager"
insecureSkipVerify: true insecureSkipVerify: true
exporter-kube-dns: exporter-kube-dns:
...@@ -73,7 +73,7 @@ exporter-kube-dns: ...@@ -73,7 +73,7 @@ exporter-kube-dns:
port: 10055 port: 10055
protocol: TCP protocol: TCP
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: kube-dns - "k8s-app=kube-dns"
insecureSkipVerify: true insecureSkipVerify: true
exporter-kube-etcd: exporter-kube-etcd:
...@@ -87,7 +87,7 @@ exporter-kube-etcd: ...@@ -87,7 +87,7 @@ exporter-kube-etcd:
port: 4001 port: 4001
protocol: TCP protocol: TCP
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: etcd-server - "k8s-app=etcd-server"
insecureSkipVerify: true insecureSkipVerify: true
caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
certFile: "" certFile: ""
...@@ -104,14 +104,14 @@ exporter-kube-scheduler: ...@@ -104,14 +104,14 @@ exporter-kube-scheduler:
port: 10251 port: 10251
protocol: TCP protocol: TCP
serviceSelectorLabels: serviceSelectorLabels:
component: kube-scheduler - "component=kube-scheduler"
insecureSkipVerify: true insecureSkipVerify: true
exporter-kubelets: exporter-kubelets:
enabled: false enabled: false
apiGroup: "monitoring.coreos.com" apiGroup: "monitoring.coreos.com"
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: kubelet - "k8s-app=kubelet"
insecureSkipVerify: true insecureSkipVerify: true
## Set false when using GKE ## Set false when using GKE
## ##
...@@ -125,8 +125,8 @@ exporter-kubernetes: ...@@ -125,8 +125,8 @@ exporter-kubernetes:
scheme: https scheme: https
name: https name: https
serviceSelectorLabels: serviceSelectorLabels:
component: apiserver - "component=apiserver"
provider: kubernetes - "provider=kubernetes"
insecureSkipVerify: true insecureSkipVerify: true
exporter-fluentd: exporter-fluentd:
...@@ -137,7 +137,7 @@ exporter-fluentd: ...@@ -137,7 +137,7 @@ exporter-fluentd:
scheme: http scheme: http
name: metrics name: metrics
serviceSelectorLabels: serviceSelectorLabels:
k8s-app: fluentd - "k8s-app=fluentd"
insecureSkipVerify: true insecureSkipVerify: true
metric-expression-project: metric-expression-project:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment