Skip to content

Commit a24032c

Browse files
kangclzjckangclzjc
committed
remove schdulerName
Signed-off-by: kangclzjc <kangz@nvidia.com>
1 parent 5f69377 commit a24032c

File tree

8 files changed

+2
-24
lines changed

8 files changed

+2
-24
lines changed

‎operator/e2e/yaml/workload1.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ spec:
1818
replicas: 2
1919
minAvailable: 2
2020
podSpec:
21-
schedulerName: kai-scheduler
2221
affinity:
2322
nodeAffinity:
2423
requiredDuringSchedulingIgnoredDuringExecution:
@@ -47,7 +46,6 @@ spec:
4746
replicas: 1
4847
minAvailable: 1
4948
podSpec:
50-
schedulerName: kai-scheduler
5149
affinity:
5250
nodeAffinity:
5351
requiredDuringSchedulingIgnoredDuringExecution:
@@ -76,7 +74,6 @@ spec:
7674
replicas: 3
7775
minAvailable: 3
7876
podSpec:
79-
schedulerName: kai-scheduler
8077
affinity:
8178
nodeAffinity:
8279
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/e2e/yaml/workload2.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ spec:
1818
replicas: 2
1919
minAvailable: 1
2020
podSpec:
21-
schedulerName: kai-scheduler
2221
affinity:
2322
nodeAffinity:
2423
requiredDuringSchedulingIgnoredDuringExecution:
@@ -47,7 +46,6 @@ spec:
4746
replicas: 1
4847
minAvailable: 1
4948
podSpec:
50-
schedulerName: kai-scheduler
5149
affinity:
5250
nodeAffinity:
5351
requiredDuringSchedulingIgnoredDuringExecution:
@@ -76,7 +74,6 @@ spec:
7674
replicas: 3
7775
minAvailable: 1
7876
podSpec:
79-
schedulerName: kai-scheduler
8077
affinity:
8178
nodeAffinity:
8279
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/e2e/yaml/workload3.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
replicas: 2
2020
minAvailable: 2
2121
podSpec:
22-
schedulerName: kai-scheduler
2322
affinity:
2423
nodeAffinity:
2524
requiredDuringSchedulingIgnoredDuringExecution:
@@ -48,7 +47,6 @@ spec:
4847
replicas: 1
4948
minAvailable: 1
5049
podSpec:
51-
schedulerName: kai-scheduler
5250
affinity:
5351
nodeAffinity:
5452
requiredDuringSchedulingIgnoredDuringExecution:
@@ -77,7 +75,6 @@ spec:
7775
replicas: 3
7876
minAvailable: 3
7977
podSpec:
80-
schedulerName: kai-scheduler
8178
affinity:
8279
nodeAffinity:
8380
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/e2e/yaml/workload4.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
replicas: 2
2020
minAvailable: 1
2121
podSpec:
22-
schedulerName: kai-scheduler
2322
affinity:
2423
nodeAffinity:
2524
requiredDuringSchedulingIgnoredDuringExecution:
@@ -48,7 +47,6 @@ spec:
4847
replicas: 1
4948
minAvailable: 1
5049
podSpec:
51-
schedulerName: kai-scheduler
5250
affinity:
5351
nodeAffinity:
5452
requiredDuringSchedulingIgnoredDuringExecution:
@@ -77,7 +75,6 @@ spec:
7775
replicas: 3
7876
minAvailable: 1
7977
podSpec:
80-
schedulerName: kai-scheduler
8178
affinity:
8279
nodeAffinity:
8380
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/e2e/yaml/workload5.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
replicas: 2
2020
minAvailable: 2
2121
podSpec:
22-
schedulerName: kai-scheduler
2322
affinity:
2423
nodeAffinity:
2524
requiredDuringSchedulingIgnoredDuringExecution:
@@ -50,7 +49,6 @@ spec:
5049
startsAfter:
5150
- pc-c
5251
podSpec:
53-
schedulerName: kai-scheduler
5452
affinity:
5553
nodeAffinity:
5654
requiredDuringSchedulingIgnoredDuringExecution:
@@ -81,7 +79,6 @@ spec:
8179
startsAfter:
8280
- pc-a
8381
podSpec:
84-
schedulerName: kai-scheduler
8582
affinity:
8683
nodeAffinity:
8784
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/e2e/yaml/workload6.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
replicas: 2
2020
minAvailable: 1
2121
podSpec:
22-
schedulerName: kai-scheduler
2322
affinity:
2423
nodeAffinity:
2524
requiredDuringSchedulingIgnoredDuringExecution:
@@ -50,7 +49,6 @@ spec:
5049
startsAfter:
5150
- pc-a
5251
podSpec:
53-
schedulerName: kai-scheduler
5452
affinity:
5553
nodeAffinity:
5654
requiredDuringSchedulingIgnoredDuringExecution:
@@ -81,7 +79,6 @@ spec:
8179
startsAfter:
8280
- pc-b
8381
podSpec:
84-
schedulerName: kai-scheduler
8582
affinity:
8683
nodeAffinity:
8784
requiredDuringSchedulingIgnoredDuringExecution:

‎operator/internal/controller/podclique/components/pod/pod.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ func (r _resource) buildResource(pcs *grovecorev1alpha1.PodCliqueSet, pclq *grov
160160
)
161161
}
162162
pod.Spec = *pclq.Spec.PodSpec.DeepCopy()
163+
pod.Spec.SchedulingGates = []corev1.PodSchedulingGate{{Name: podGangSchedulingGate}}
163164

164165
// Use backend to prepare Pod spec based on scheduler requirements
165166
// This adds schedulerName, scheduling gates, annotations, etc.
@@ -175,7 +176,6 @@ func (r _resource) buildResource(pcs *grovecorev1alpha1.PodCliqueSet, pclq *grov
175176
addEnvironmentVariables(pod, pclq, pcsName, pcsReplicaIndex, podIndex)
176177
// Configure hostname and subdomain for service discovery
177178
configurePodHostname(pcsName, pcsReplicaIndex, pclq.Name, pod, podIndex)
178-
179179
// If there is a need to enforce a Startup-Order then configure the init container and add it to the Pod Spec.
180180
if len(pclq.Spec.StartsAfter) != 0 {
181181
return configurePodInitContainer(pcs, pclq, pod)

‎operator/internal/schedulerbackend/kai/backend.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,11 @@ func (b *Backend) OnPodGangDelete(_ context.Context, _ *groveschedulerv1alpha1.P
9191
}
9292

9393
// PreparePod adds KAI scheduler-specific configuration to the Pod
94-
// This includes: schedulerName, scheduling gates, and annotations
94+
// This includes: schedulerName, and annotations
9595
func (b *Backend) PreparePod(pod *corev1.Pod) {
9696
// Set scheduler name from configuration
9797
pod.Spec.SchedulerName = b.schedulerName
9898

99-
pod.Spec.SchedulingGates = []corev1.PodSchedulingGate{
100-
{Name: SchedulingGateName},
101-
}
102-
10399
// Add annotations for observability
104100
if pod.Annotations == nil {
105101
pod.Annotations = make(map[string]string)

0 commit comments

Comments
 (0)