From 075e8dce0002559f9db771896153645b64e70598 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Wed, 27 Dec 2017 16:06:04 +0800 Subject: [PATCH] fix local up cluster startup flag bug --- plugin/cmd/kube-scheduler/BUILD | 1 + plugin/cmd/kube-scheduler/app/BUILD | 1 - plugin/cmd/kube-scheduler/app/server.go | 5 +---- plugin/cmd/kube-scheduler/scheduler.go | 2 ++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugin/cmd/kube-scheduler/BUILD b/plugin/cmd/kube-scheduler/BUILD index 74f35ec92fa..905919efa49 100644 --- 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", ], ) diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/plugin/cmd/kube-scheduler/app/BUILD index 5584eebff35..9de3152c18c 100644 --- 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", diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index e8d80644627..a304257248a 100644 --- 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") diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/plugin/cmd/kube-scheduler/scheduler.go index f9e93db9c8c..047ef86cffa 100644 --- 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()