From 3985434497208ae9e8c6950eb82ce1ac96f2fc53 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Sun, 28 Jul 2024 21:12:12 -0700 Subject: [PATCH] update Helm's deployment spec --- doc/develop.md | 3 +-- .../deploy-sig-scheduling-controller-and-scheduler.yaml | 3 +-- .../charts/as-a-second-scheduler/templates/deployment.yaml | 5 ++--- manifests/install/charts/as-a-second-scheduler/values.yaml | 4 ++-- .../deploy-sig-scheduling-controller-and-scheduler.yaml | 3 +-- manifests/noderesourcetopology/deploy.yaml | 3 +-- site/content/en/docs/user-guide/develop.md | 3 +-- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/doc/develop.md b/doc/develop.md index d8cf288b5..1d35f3ca3 100644 --- a/doc/develop.md +++ b/doc/develop.md @@ -79,8 +79,7 @@ spec: containers: - image: localhost:5000/scheduler-plugins/kube-scheduler:latest imagePullPolicy: Never - command: - - /bin/kube-scheduler + args: - --authentication-kubeconfig=/etc/kubernetes/scheduler.conf - --authorization-kubeconfig=/etc/kubernetes/scheduler.conf - --config=/etc/kubernetes/configs/scheduler-config.yaml diff --git a/manifests/appgroup/deploy-sig-scheduling-controller-and-scheduler.yaml b/manifests/appgroup/deploy-sig-scheduling-controller-and-scheduler.yaml index 5ac457929..c79b2160c 100644 --- a/manifests/appgroup/deploy-sig-scheduling-controller-and-scheduler.yaml +++ b/manifests/appgroup/deploy-sig-scheduling-controller-and-scheduler.yaml @@ -114,8 +114,7 @@ spec: node-role.kubernetes.io/master: "" containers: - image: registry.k8s.io/scheduler-plugins/kube-scheduler:v0.29.7 - command: # For extra info, please add verbose level: e.g., - -v=9 - - /bin/kube-scheduler + args: # For extra info, please add verbose level: e.g., - -v=9 - --authentication-kubeconfig=/etc/kubernetes/scheduler.conf - --authorization-kubeconfig=/etc/kubernetes/scheduler.conf - --config=/etc/kubernetes/scheduler-config.yaml diff --git a/manifests/install/charts/as-a-second-scheduler/templates/deployment.yaml b/manifests/install/charts/as-a-second-scheduler/templates/deployment.yaml index 9d7286be3..9d0b37305 100644 --- a/manifests/install/charts/as-a-second-scheduler/templates/deployment.yaml +++ b/manifests/install/charts/as-a-second-scheduler/templates/deployment.yaml @@ -50,8 +50,7 @@ spec: spec: serviceAccountName: {{ .Values.scheduler.name }} containers: - - command: - - /bin/kube-scheduler + - args: - --config=/etc/kubernetes/scheduler-config.yaml image: {{ .Values.scheduler.image }} imagePullPolicy: IfNotPresent @@ -91,4 +90,4 @@ spec: {{- with .Values.scheduler.tolerations }} tolerations: {{- toYaml . | nindent 8}} {{- end }} - \ No newline at end of file + diff --git a/manifests/install/charts/as-a-second-scheduler/values.yaml b/manifests/install/charts/as-a-second-scheduler/values.yaml index 5d59314f3..2e9db05dc 100644 --- a/manifests/install/charts/as-a-second-scheduler/values.yaml +++ b/manifests/install/charts/as-a-second-scheduler/values.yaml @@ -4,7 +4,7 @@ scheduler: name: scheduler-plugins-scheduler - image: registry.k8s.io/scheduler-plugins/kube-scheduler:v0.29.7 + image: gcr.io/k8s-staging-scheduler-plugins/kube-scheduler:v20240729-v0.29.7 replicaCount: 1 leaderElect: false nodeSelector: {} @@ -13,7 +13,7 @@ scheduler: controller: name: scheduler-plugins-controller - image: registry.k8s.io/scheduler-plugins/controller:v0.29.7 + image: gcr.io/k8s-staging-scheduler-plugins/controller:v20240729-v0.29.7 replicaCount: 1 nodeSelector: {} affinity: {} diff --git a/manifests/networktopology/deploy-sig-scheduling-controller-and-scheduler.yaml b/manifests/networktopology/deploy-sig-scheduling-controller-and-scheduler.yaml index 5ac457929..c79b2160c 100644 --- a/manifests/networktopology/deploy-sig-scheduling-controller-and-scheduler.yaml +++ b/manifests/networktopology/deploy-sig-scheduling-controller-and-scheduler.yaml @@ -114,8 +114,7 @@ spec: node-role.kubernetes.io/master: "" containers: - image: registry.k8s.io/scheduler-plugins/kube-scheduler:v0.29.7 - command: # For extra info, please add verbose level: e.g., - -v=9 - - /bin/kube-scheduler + args: # For extra info, please add verbose level: e.g., - -v=9 - --authentication-kubeconfig=/etc/kubernetes/scheduler.conf - --authorization-kubeconfig=/etc/kubernetes/scheduler.conf - --config=/etc/kubernetes/scheduler-config.yaml diff --git a/manifests/noderesourcetopology/deploy.yaml b/manifests/noderesourcetopology/deploy.yaml index ff5855eae..151510197 100644 --- a/manifests/noderesourcetopology/deploy.yaml +++ b/manifests/noderesourcetopology/deploy.yaml @@ -25,8 +25,7 @@ spec: containers: - image: localhost:5000/scheduler-plugins/kube-scheduler:latest imagePullPolicy: Never - command: - - /bin/kube-scheduler + args: - --authentication-kubeconfig=/etc/kubernetes/scheduler.conf - --authorization-kubeconfig=/etc/kubernetes/scheduler.conf - --config=/etc/kubernetes/scheduler-config/scheduler-config.yaml diff --git a/site/content/en/docs/user-guide/develop.md b/site/content/en/docs/user-guide/develop.md index e712e6e84..8638cdf05 100644 --- a/site/content/en/docs/user-guide/develop.md +++ b/site/content/en/docs/user-guide/develop.md @@ -83,8 +83,7 @@ spec: containers: - image: localhost:5000/scheduler-plugins/kube-scheduler:latest imagePullPolicy: Never - command: - - /bin/kube-scheduler + args: - --authentication-kubeconfig=/etc/kubernetes/scheduler.conf - --authorization-kubeconfig=/etc/kubernetes/scheduler.conf - --config=/etc/kubernetes/configs/scheduler-config.yaml