kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8430 from rralcala/master 

Fixes regression in e2e tests
This commit is contained in:
Kubernetes Prow Robot 2020-01-29 06:46:14 -08:00 committed by GitHub
parent 044196ac94 504ac7545a
commit 88d0969542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/kube_scheduler.go
View File

@ -63,7 +63,7 @@ func (b *KubeSchedulerBuilder) Build(c *fi.ModelBuilderContext) error {
if !b.IsMaster { if !b.IsMaster {
return nil return nil
} }
useConfigFile := b.IsKubernetesGTE("1.11") useConfigFile := b.IsKubernetesGTE("1.12")
{ {
pod, err := b.buildPod(useConfigFile) pod, err := b.buildPod(useConfigFile)
if err != nil { if err != nil {