Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use scheduler configuration to run tidb-scheduler #4202

Merged
merged 7 commits into from
Oct 14, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions charts/tidb-operator/templates/config/_scheduler-config-yaml.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: kubescheduler.config.k8s.io/v1beta1
kind: KubeSchedulerConfiguration
leaderElection:
leaderElect: true
resourceNamespace: {{ .Release.Namespace }}
{{- if eq .Values.appendReleaseSuffix true}}
resourceName: {{ .Values.scheduler.schedulerName }}-{{.Release.Name}}
{{- else }}
resourceName: {{ .Values.scheduler.schedulerName }}
{{- end }}
healthzBindAddress: 0.0.0.0:10261
metricsBindAddress: 0.0.0.0:10261
profiles:
- schedulerName: tidb-scheduler
extenders:
- urlPrefix: http://127.0.0.1:10262/scheduler
filterVerb: filter
preemptVerb: preempt
weight: 1
enableHTTPS: false
httpTimeout: 30s
25 changes: 25 additions & 0 deletions charts/tidb-operator/templates/scheduler-config-configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{{- if (hasKey .Values.scheduler "create" | ternary .Values.scheduler.create true) | and (semverCompare ">=1.19.0-0" .Capabilities.KubeVersion.GitVersion) }}
apiVersion: v1
kind: ConfigMap
metadata:
{{- $annotations := .Values.scheduler.configmapAnnotations | default dict }}
{{- if gt (len $annotations) 0 }}
annotations:
{{ toYaml $annotations | indent 4 }}
{{- end }}
{{- if eq .Values.appendReleaseSuffix true}}
name: {{ .Values.scheduler.schedulerName }}-config-{{.Release.Name}}
{{- else }}
name: {{ .Values.scheduler.schedulerName }}-config
{{- end }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: {{ template "chart.name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: scheduler
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
data:
scheduler-config.yaml: |-
{{ tuple "config/_scheduler-config-yaml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
28 changes: 24 additions & 4 deletions charts/tidb-operator/templates/scheduler-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if (hasKey .Values.scheduler "create" | ternary .Values.scheduler.create true) }}
{{- $lgK8sV119 := (semverCompare ">=1.19.0-0" .Capabilities.KubeVersion.GitVersion) }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -69,24 +70,33 @@ spec:
command:
- kube-scheduler
- --port=10261
- --v={{ .Values.scheduler.logLevel }}
{{- if $lgK8sV119 }}
- --config=/etc/kubernetes/scheduler-config.yaml
{{- else }}
- --leader-elect=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only used when Kubernetes version <1.19?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use scheduler configuration when version >= 1.19

- --lock-object-namespace={{ .Release.Namespace }}
{{- if eq .Values.appendReleaseSuffix true}}
- --policy-configmap-namespace={{ .Release.Namespace }}
{{- if eq .Values.appendReleaseSuffix true}}
- --lock-object-name={{ .Values.scheduler.schedulerName }}-{{.Release.Name}}
- --scheduler-name={{ .Values.scheduler.schedulerName }}-{{.Release.Name}}
- --policy-configmap={{ .Values.scheduler.schedulerName }}-policy-{{.Release.Name}}
{{- else }}
{{- else }}
- --lock-object-name={{ .Values.scheduler.schedulerName }}
- --scheduler-name={{ .Values.scheduler.schedulerName }}
- --policy-configmap={{ .Values.scheduler.schedulerName }}-policy
{{- end }}
{{- end }}
- --v={{ .Values.scheduler.logLevel }}
- --policy-configmap-namespace={{ .Release.Namespace }}
{{- if and (ne .Values.timezone "UTC") (ne .Values.timezone "") }}
env:
- name: TZ
value: {{ .Values.timezone | default "UTC" }}
{{- end }}
{{- if $lgK8sV119 }}
volumeMounts:
- name: scheduler-config
mountPath: /etc/kubernetes
{{- end }}
{{- with .Values.scheduler.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
Expand All @@ -103,4 +113,14 @@ spec:
securityContext:
{{ toYaml . | indent 8 }}
{{- end}}
{{- if $lgK8sV119 }}
volumes:
- name: scheduler-config
configMap:
{{- if eq .Values.appendReleaseSuffix true}}
name: {{ .Values.scheduler.schedulerName }}-config-{{.Release.Name}}
{{- else }}
name: {{ .Values.scheduler.schedulerName }}-config
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if (hasKey .Values.scheduler "create" | ternary .Values.scheduler.create true) }}
{{- if (hasKey .Values.scheduler "create" | ternary .Values.scheduler.create true) | and (semverCompare "<1.19.0-0" .Capabilities.KubeVersion.GitVersion) }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down