Merge pull request #38871 from k82cn/k8s_25318

Automatic merge from submit-queue

Made multi-scheduler graduated to Beta and then v1.

fixes #25318
This commit is contained in:
Kubernetes Submit Queue
2017-01-19 07:58:51 -08:00
committed by GitHub
42 changed files with 1094 additions and 900 deletions

View File

@@ -131,6 +131,7 @@ func TestMerge(t *testing.T) {
DNSPolicy: api.DNSClusterFirst,
TerminationGracePeriodSeconds: &grace,
SecurityContext: &api.PodSecurityContext{},
SchedulerName: api.DefaultSchedulerName,
},
},
},