wilfred-s commented on code in PR #966:
URL: https://github.com/apache/yunikorn-k8shim/pull/966#discussion_r2567186151
##########
pkg/admission/admission_controller.go:
##########
@@ -194,7 +194,16 @@ func (c *AdmissionController) processPod(req
*admissionv1.AdmissionRequest, name
log.Log(log.Admission).Info("bypassing namespace",
zap.String("namespace", namespace))
return admissionResponseBuilder(uid, true, "", nil)
}
- patch = updateSchedulerName(patch)
+
+ // Only override default-scheduler unless override is enabled
+ if c.conf.GetOverrideCustomSchedulers() && pod.Spec.SchedulerName !=
constants.SchedulerName {
+ log.Log(log.Admission).Info("updating scheduler name",
+ zap.String("from", pod.Spec.SchedulerName),
+ zap.String("to", constants.SchedulerName))
+ patch = updateSchedulerName(patch)
+ } else if pod.Spec.SchedulerName == "" || pod.Spec.SchedulerName ==
"default-scheduler" {
Review Comment:
Fold this into one if:
```
if (c.shouldProcessNamespace(namespace) && pod.Spec.SchedulerName !=
constants.SchedulerName) ||
(pod.Spec.SchedulerName == "" || pod.Spec.SchedulerName ==
"default-scheduler") {
log.Log(....)
patch = updateSchedulerName(patch)
}
```
##########
pkg/admission/admission_controller.go:
##########
@@ -194,7 +194,16 @@ func (c *AdmissionController) processPod(req
*admissionv1.AdmissionRequest, name
log.Log(log.Admission).Info("bypassing namespace",
zap.String("namespace", namespace))
return admissionResponseBuilder(uid, true, "", nil)
}
- patch = updateSchedulerName(patch)
+
+ // Only override default-scheduler unless override is enabled
+ if c.conf.GetOverrideCustomSchedulers() && pod.Spec.SchedulerName !=
constants.SchedulerName {
+ log.Log(log.Admission).Info("updating scheduler name",
+ zap.String("from", pod.Spec.SchedulerName),
+ zap.String("to", constants.SchedulerName))
Review Comment:
We should update the logging in the `updateSchedulerName` function as we now
do it twice in this case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
