Merge pull request #80824 from damemi/preemption-e2e-to-integration

Move PodPriorityResolution e2e to integration
This commit is contained in:
Kubernetes Prow Robot
2019-09-20 12:27:25 -07:00
committed by GitHub
6 changed files with 134 additions and 65 deletions

View File

@@ -463,6 +463,7 @@ type pausePodConfig struct {
NodeName string
SchedulerName string
Priority *int32
PriorityClassName string
}
// initPausePod initializes a pod API object from the given config. It is used
@@ -484,10 +485,11 @@ func initPausePod(cs clientset.Interface, conf *pausePodConfig) *v1.Pod {
Image: imageutils.GetPauseImageName(),
},
},
Tolerations: conf.Tolerations,
NodeName: conf.NodeName,
SchedulerName: conf.SchedulerName,
Priority: conf.Priority,
Tolerations: conf.Tolerations,
NodeName: conf.NodeName,
SchedulerName: conf.SchedulerName,
Priority: conf.Priority,
PriorityClassName: conf.PriorityClassName,
},
}
if conf.Resources != nil {