Merge pull request kubernetes#71601 from liggitt/surface-insecure-port-help

k8s-ci-robot · web-flow · commit 611c3510d829 · 2018-12-07T09:08:39.000-08:00
Surface help for insecure ports to explain how to disable
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go
@@ -85,11 +85,13 @@ func (s *DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs *pflag.FlagSet
 	}
 
 	fs.IPVar(&s.BindAddress, "address", s.BindAddress,
-		"DEPRECATED: see --bind-address instead.")
+		"The IP address on which to serve the insecure --port (set to 0.0.0.0 for all IPv4 interfaces and :: for all IPv6 interfaces).")
 	fs.MarkDeprecated("address", "see --bind-address instead.")
+	fs.Lookup("address").Hidden = false
 
-	fs.IntVar(&s.BindPort, "port", s.BindPort, "DEPRECATED: see --secure-port instead.")
+	fs.IntVar(&s.BindPort, "port", s.BindPort, "The port on which to serve unsecured, unauthenticated access. Set to 0 to disable.")
 	fs.MarkDeprecated("port", "see --secure-port instead.")
+	fs.Lookup("port").Hidden = false
 }
 
 // ApplyTo adds DeprecatedInsecureServingOptions to the insecureserverinfo amd kube-controller manager configuration.

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,13 @@ func (s DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs pflag.FlagSet`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`fs.IPVar(&s.BindAddress, "address", s.BindAddress,`
`88`		`- "DEPRECATED: see --bind-address instead.")`
	`88`	`+ "The IP address on which to serve the insecure --port (set to 0.0.0.0 for all IPv4 interfaces and :: for all IPv6 interfaces).")`
`89`	`89`	`fs.MarkDeprecated("address", "see --bind-address instead.")`
	`90`	`+ fs.Lookup("address").Hidden = false`
`90`	`91`
`91`		`- fs.IntVar(&s.BindPort, "port", s.BindPort, "DEPRECATED: see --secure-port instead.")`
	`92`	`+ fs.IntVar(&s.BindPort, "port", s.BindPort, "The port on which to serve unsecured, unauthenticated access. Set to 0 to disable.")`
`92`	`93`	`fs.MarkDeprecated("port", "see --secure-port instead.")`
	`94`	`+ fs.Lookup("port").Hidden = false`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`// ApplyTo adds DeprecatedInsecureServingOptions to the insecureserverinfo amd kube-controller manager configuration.`