From 9e657b874d7b02fe70d294f12340e1dd2db0f538 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Tue, 30 Jan 2018 16:05:33 +0800 Subject: [PATCH] deprecate insecure http flags and remove already deprecated public-address-override Kubernetes-commit: 24c687fdad009fec01703ae0f93ab141b97c0028 --- pkg/server/options/serving.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/server/options/serving.go b/pkg/server/options/serving.go index 84fde93c7..edf2b02f5 100644 --- a/pkg/server/options/serving.go +++ b/pkg/server/options/serving.go @@ -98,7 +98,7 @@ func (s *SecureServingOptions) Validate() []error { errors := []error{} if s.BindPort < 0 || s.BindPort > 65535 { - errors = append(errors, fmt.Errorf("--secure-port %v must be between 0 and 65535, inclusive. 0 for turning off secure port.", s.BindPort)) + errors = append(errors, fmt.Errorf("--secure-port %v must be between 0 and 65535, inclusive. 0 for turning off secure port", s.BindPort)) } return errors @@ -155,12 +155,6 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) { } -func (s *SecureServingOptions) AddDeprecatedFlags(fs *pflag.FlagSet) { - fs.IPVar(&s.BindAddress, "public-address-override", s.BindAddress, - "DEPRECATED: see --bind-address instead.") - fs.MarkDeprecated("public-address-override", "see --bind-address instead.") -} - // ApplyTo fills up serving information in the server configuration. func (s *SecureServingOptions) ApplyTo(c *server.Config) error { if s == nil {