Merge pull request #57650 from hzxuzhonghu/flag-fix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix local up cluster startup flag bug **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #57628 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57650 from hzxuzhonghu/flag-fix
66de5952 · Kubernetes Submit Queue · GitHub · 4d215fd2 · 075e8dce · 66de5952
Unverified Commit 66de5952 authored Dec 28, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 28, 2017
Showing with 4 additions and 5 deletions

BUILD plugin/cmd/kube-scheduler/BUILD +1 -0

BUILD plugin/cmd/kube-scheduler/app/BUILD +0 -1

server.go plugin/cmd/kube-scheduler/app/server.go +1 -4

scheduler.go plugin/cmd/kube-scheduler/scheduler.go +2 -0

No files found.
--- a/plugin/cmd/kube-scheduler/BUILD
+++ b/plugin/cmd/kube-scheduler/BUILD
@@ -23,6 +23,7 @@ go_library(
        "//pkg/client/metrics/prometheus:go_default_library",
        "//pkg/version/prometheus:go_default_library",
        "//plugin/cmd/kube-scheduler/app:go_default_library",
+        "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library",
    ],
 )

--- a/plugin/cmd/kube-scheduler/app/BUILD
+++ b/plugin/cmd/kube-scheduler/app/BUILD
@@ -38,7 +38,6 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/server/healthz:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
        "//vendor/k8s.io/client-go/informers:go_default_library",
        "//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
        "//vendor/k8s.io/client-go/informers/storage/v1:go_default_library",

--- a/plugin/cmd/kube-scheduler/app/server.go
+++ b/plugin/cmd/kube-scheduler/app/server.go
@@ -68,11 +68,9 @@ import (
 	"k8s.io/kubernetes/plugin/pkg/scheduler/factory"

 	"github.com/golang/glog"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	utilflag "k8s.io/apiserver/pkg/util/flag"
-
-	"github.com/prometheus/client_golang/prometheus"
 )

 // SchedulerServer has all the context and params needed to run a Scheduler
@@ -344,7 +342,6 @@ through the API as necessary.`,
 	}

 	opts.AddFlags(pflag.CommandLine)
-	utilflag.InitFlags()

 	cmd.MarkFlagFilename("config", "yaml", "yml", "json")


--- a/plugin/cmd/kube-scheduler/scheduler.go
+++ b/plugin/cmd/kube-scheduler/scheduler.go
@@ -19,6 +19,7 @@ package main
 import (
 	"os"

+	utilflag "k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/apiserver/pkg/util/logs"
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
 	_ "k8s.io/kubernetes/pkg/version/prometheus"        // for version metric registration
@@ -28,6 +29,7 @@ import (
 func main() {
 	command := app.NewSchedulerCommand()

+	utilflag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()