Skip to content

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

Support random nodeSelector label name

**Problem:** Cannot input like `x.y.z/k` label name into nodeSelector **Solution:** Use array instead of object as values **Issue:** https://github.com/rancher/rancher/issues/17340
parent 13b5a79d
Showing with 98 additions and 40 deletions
charts/rancher-monitoring/v0.0.2/charts/alertmanager/templates/alertmanager.yaml
...@@ -28,10 +28,16 @@ spec: ...@@ -28,10 +28,16 @@ spec:
{{- if .Values.externalUrl }} {{- if .Values.externalUrl }}
externalUrl: "{{ .Values.externalUrl }}" externalUrl: "{{ .Values.externalUrl }}"
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 4 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
paused: {{ .Values.paused }} paused: {{ .Values.paused }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
logLevel: {{ .Values.logLevel }} logLevel: {{ .Values.logLevel }}
......
charts/rancher-monitoring/v0.0.2/charts/alertmanager/templates/nginx-deployment.yaml
...@@ -47,6 +47,20 @@ spec: ...@@ -47,6 +47,20 @@ spec:
- name: http - name: http
containerPort: 80 containerPort: 80
protocol: TCP protocol: TCP
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
nodeSelector:
beta.kubernetes.io/os: linux
{{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
volumes: volumes:
- name: alertmanager-nginx - name: alertmanager-nginx
configMap: configMap:
......
charts/rancher-monitoring/v0.0.2/charts/alertmanager/values.yaml
...@@ -78,12 +78,12 @@ image: ...@@ -78,12 +78,12 @@ image:
## Node labels for Alertmanager pod assignment ## Node labels for Alertmanager pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
## ##
nodeSelector: {} nodeSelectors: []
## Tolerations for use with node taints ## Tolerations for use with node taints
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
## ##
tolerations: {} tolerations: []
# - key: "key" # - key: "key"
# operator: "Equal" # operator: "Equal"
# value: "value" # value: "value"
......
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-state/templates/deployment.yaml
...@@ -54,7 +54,13 @@ spec: ...@@ -54,7 +54,13 @@ spec:
tolerations: tolerations:
{{ toYaml .Values.tolerations | indent 8 }} {{ toYaml .Values.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
charts/rancher-monitoring/v0.0.2/charts/exporter-kube-state/values.yaml
...@@ -28,12 +28,12 @@ resources: ...@@ -28,12 +28,12 @@ resources:
## Node Selector to constrain pods to run on particular nodes ## Node Selector to constrain pods to run on particular nodes
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
## ##
nodeSelector: {} nodeSelectors: []
## Tolerations for use with node taints ## Tolerations for use with node taints
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
## ##
tolerations: {} tolerations: []
# - key: "key" # - key: "key"
# operator: "Equal" # operator: "Equal"
# value: "value" # value: "value"
......
charts/rancher-monitoring/v0.0.2/charts/exporter-node/templates/daemonset.yaml
...@@ -80,10 +80,16 @@ spec: ...@@ -80,10 +80,16 @@ spec:
tolerations: tolerations:
{{ toYaml .Values.tolerations | indent 8 }} {{ toYaml .Values.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- if .Values.enabledHostNetwork }} {{- if .Values.enabledHostNetwork }}
hostNetwork: true hostNetwork: true
{{- end }} {{- end }}
......
charts/rancher-monitoring/v0.0.2/charts/exporter-node/values.yaml
...@@ -41,7 +41,7 @@ tolerations: ...@@ -41,7 +41,7 @@ tolerations:
## Node Selector to constrain pods to run on particular nodes ## Node Selector to constrain pods to run on particular nodes
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
## ##
nodeSelector: {} nodeSelectors: []
serviceMonitorLabels: {} serviceMonitorLabels: {}
......
charts/rancher-monitoring/v0.0.2/charts/grafana/templates/deployment.yaml
...@@ -108,10 +108,16 @@ spec: ...@@ -108,10 +108,16 @@ spec:
resources: resources:
{{ toYaml .Values.resources.proxy | indent 10 }} {{ toYaml .Values.resources.proxy | indent 10 }}
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 4 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- if .Values.enabledRBAC }} {{- if .Values.enabledRBAC }}
serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }} serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }}
{{- end }} {{- end }}
......
charts/rancher-monitoring/v0.0.2/charts/grafana/values.yaml
...@@ -13,12 +13,12 @@ apiGroup: "monitoring.coreos.com" ...@@ -13,12 +13,12 @@ apiGroup: "monitoring.coreos.com"
## Node labels for Grafana pod assignment ## Node labels for Grafana pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
## ##
nodeSelector: {} nodeSelectors: []
## Tolerations for use with node taints ## Tolerations for use with node taints
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
## ##
tolerations: {} tolerations: []
# - key: "key" # - key: "key"
# operator: "Equal" # operator: "Equal"
# value: "value" # value: "value"
......
charts/rancher-monitoring/v0.0.2/charts/prometheus/templates/nginx-deployment.yaml
...@@ -63,6 +63,20 @@ spec: ...@@ -63,6 +63,20 @@ spec:
{{- if .Values.enabledRBAC }} {{- if .Values.enabledRBAC }}
serviceAccountName: {{ default (default (include "app.fullname" .) .Values.serviceAccountName) .Values.serviceAccountNameOverride }} serviceAccountName: {{ default (default (include "app.fullname" .) .Values.serviceAccountName) .Values.serviceAccountNameOverride }}
{{- end }} {{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
nodeSelector:
beta.kubernetes.io/os: linux
{{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
volumes: volumes:
- name: prometheus-static-hooks - name: prometheus-static-hooks
configMap: configMap:
......
charts/rancher-monitoring/v0.0.2/charts/prometheus/templates/prometheus.yaml
...@@ -96,10 +96,16 @@ spec: ...@@ -96,10 +96,16 @@ spec:
{{- if .Values.externalUrl }} {{- if .Values.externalUrl }}
externalUrl: "{{ .Values.externalUrl }}" externalUrl: "{{ .Values.externalUrl }}"
{{- end }} {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 4 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
paused: {{ .Values.paused }} paused: {{ .Values.paused }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
logLevel: {{ .Values.logLevel }} logLevel: {{ .Values.logLevel }}
......
charts/rancher-monitoring/v0.0.2/charts/prometheus/values.yaml
...@@ -69,12 +69,12 @@ auth: ...@@ -69,12 +69,12 @@ auth:
## Node labels for Prometheus pod assignment ## Node labels for Prometheus pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
## ##
nodeSelector: {} nodeSelectors: []
## Tolerations for use with node taints ## Tolerations for use with node taints
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
## ##
tolerations: {} tolerations: []
# - key: "key" # - key: "key"
# operator: "Equal" # operator: "Equal"
# value: "value" # value: "value"
......
charts/rancher-monitoring/v0.0.2/templates/deployment.yaml
...@@ -40,10 +40,16 @@ spec: ...@@ -40,10 +40,16 @@ spec:
name: http name: http
resources: resources:
{{ toYaml .Values.resources | indent 12 }} {{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} beta.kubernetes.io/os: linux
{{- end }} {{- range .Values.nodeSelectors }}
{{- $pair := regexSplit "=" . 2 }}
{{- if eq 2 (len $pair) }}
{{ (index $pair 0) }}: {{ (index $pair 1) }}
{{- else }}
{{ (index $pair 0) }}: ""
{{- end }}
{{- end }}
{{- if .Values.enabledRBAC }} {{- if .Values.enabledRBAC }}
serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }} serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }}
{{- end }} {{- end }}
......
charts/rancher-monitoring/v0.0.2/values.yaml
...@@ -26,13 +26,12 @@ image: ...@@ -26,13 +26,12 @@ image:
## Node labels for prometheus-operator pod assignment ## Node labels for prometheus-operator pod assignment
## ##
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
## Tolerations for use with node taints ## Tolerations for use with node taints
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
## ##
tolerations: {} tolerations: []
logFormat: "logfmt" logFormat: "logfmt"
...@@ -188,8 +187,7 @@ exporter-node: ...@@ -188,8 +187,7 @@ exporter-node:
image: image:
repository: prom/node-exporter repository: prom/node-exporter
tag: v0.17.0 tag: v0.17.0
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
resources: resources:
limits: limits:
cpu: 200m cpu: 200m
...@@ -214,8 +212,7 @@ exporter-kube-state: ...@@ -214,8 +212,7 @@ exporter-kube-state:
image: image:
repository: quay.io/coreos/kube-state-metrics repository: quay.io/coreos/kube-state-metrics
tag: v1.4.0 tag: v1.4.0
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
...@@ -237,8 +234,7 @@ alertmanager: ...@@ -237,8 +234,7 @@ alertmanager:
proxy: proxy:
repository: nginx repository: nginx
tag: 1.15.8-alpine tag: 1.15.8-alpine
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
resources: resources:
core: core:
limits: limits:
...@@ -295,8 +291,7 @@ grafana: ...@@ -295,8 +291,7 @@ grafana:
proxy: proxy:
repository: nginx repository: nginx
tag: 1.15.8-alpine tag: 1.15.8-alpine
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
resources: resources:
inits: inits:
limits: limits:
...@@ -358,8 +353,7 @@ prometheus: ...@@ -358,8 +353,7 @@ prometheus:
proxy: proxy:
repository: nginx repository: nginx
tag: 1.15.8-alpine tag: 1.15.8-alpine
nodeSelector: nodeSelectors: []
beta.kubernetes.io/os: linux
resources: resources:
inits: inits:
limits: limits:
......
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