Merge pull request #55041 from wackxu/remdup

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>. remove duplicate healthz check register **What this PR does / why we need it**: We registe healthz check twice, another is https://github.com/kubernetes/kubernetes/blob/master/cmd/kube-controller-manager/app/controllermanager.go#L203 we should remove the duplicate one **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55041 from wackxu/remdup
12752f31 · Kubernetes Submit Queue · GitHub · db177095 · 22a706ed · 12752f31
Unverified Commit 12752f31 authored Nov 03, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

BUILD cmd/kube-controller-manager/BUILD +0 -1

controller-manager.go cmd/kube-controller-manager/controller-manager.go +0 -5

No files found.
--- a/cmd/kube-controller-manager/BUILD
+++ b/cmd/kube-controller-manager/BUILD
@@ -33,7 +33,6 @@ go_library(
        "//pkg/version/prometheus:go_default_library",
        "//pkg/version/verflag:go_default_library",
        "//vendor/github.com/spf13/pflag:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/server/healthz:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library",
    ],

--- a/cmd/kube-controller-manager/controller-manager.go
+++ b/cmd/kube-controller-manager/controller-manager.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"os"

-	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/kubernetes/cmd/kube-controller-manager/app"
@@ -38,10 +37,6 @@ import (
 	"github.com/spf13/pflag"
 )

-func init() {
-	healthz.DefaultHealthz()
-}
-
 func main() {
 	s := options.NewCMServer()
 	s.AddFlags(pflag.CommandLine, app.KnownControllers(), app.ControllersDisabledByDefault.List())