Merge pull request #58459 from deads2k/scheduler-04-handle-empty

Automatic merge from submit-queue (batch tested with PRs 58446, 58459, 58340). 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>. handle scheduler without exposed ports Plumbs the scheduler port opt out more completely. When the metrics server was added, the deprecated paths forgot about it.

Merge pull request #58459 from deads2k/scheduler-04-handle-empty
73f95837 · Kubernetes Submit Queue · GitHub · 0dd88a1f · 5d084758 · 73f95837
Unverified Commit 73f95837 authored Jan 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

server.go cmd/kube-scheduler/app/server.go +9 -5

No files found.
--- a/cmd/kube-scheduler/app/server.go
+++ b/cmd/kube-scheduler/app/server.go
@@ -194,6 +194,7 @@ func (o *Options) applyDeprecatedHealthzAddressToConfig() {
 func (o *Options) applyDeprecatedHealthzPortToConfig() {
 	if o.healthzPort == -1 {
 		o.config.HealthzBindAddress = ""
+		o.config.MetricsBindAddress = ""
 		return
 	}
@@ -374,10 +375,13 @@ func NewSchedulerServer(config *componentconfig.KubeSchedulerConfiguration, mast
 	}
 	// Configz registration.
-	if c, err := configz.New("componentconfig"); err == nil {
+	// only register if we're actually exposing it somewhere
-		c.Set(config)
+	if len(config.MetricsBindAddress) > 0 || len(config.HealthzBindAddress) > 0 {
-	} else {
+		if c, err := configz.New("componentconfig"); err == nil {
-		return nil, fmt.Errorf("unable to register configz: %s", err)
+			c.Set(config)
+		} else {
+			return nil, fmt.Errorf("unable to register configz: %s", err)
+		}
 	}
 	// Prepare some Kube clients.
@@ -402,7 +406,7 @@ func NewSchedulerServer(config *componentconfig.KubeSchedulerConfiguration, mast
 	// Prepare a healthz server. If the metrics bind address is the same as the
 	// healthz bind address, consolidate the servers into one.
 	var healthzServer *http.Server
-	if len(config.HealthzBindAddress) != 0 {
+	if len(config.HealthzBindAddress) > 0 {
 		healthzServer = makeHealthzServer(config)
 	}