Merge pull request kubernetes#123972 from deads2k/remove-insecure-ser…

…ving Remove k8s.io/apiserver ability to bind insecure ports
ii · Apr 18, 2024 · daa3356 · daa3356
2 parents 7f67cb5 + de302c7
commit daa3356
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 136 deletions.
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
diff --git a/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/options/options.go b/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/options/options.go
@@ -40,21 +40,18 @@ type Options struct {
 	ClientQPSLimit float32
 	ClientQPSBurst int
 
-	SecureServing   apiserveroptions.SecureServingOptions
-	InsecureServing apiserveroptions.DeprecatedInsecureServingOptions
+	SecureServing apiserveroptions.SecureServingOptions
 }
 
 func NewOptions() *Options {
 	secureServing := apiserveroptions.NewSecureServingOptions()
 	secureServing.ServerCert.PairName = "webhook"
 	o := &Options{
-		SecureServing:   *secureServing,
-		InsecureServing: apiserveroptions.DeprecatedInsecureServingOptions{},
-		ClientQPSLimit:  DefaultClientQPSLimit,
-		ClientQPSBurst:  DefaultClientQPSBurst,
+		SecureServing:  *secureServing,
+		ClientQPSLimit: DefaultClientQPSLimit,
+		ClientQPSBurst: DefaultClientQPSBurst,
 	}
 	o.SecureServing.BindPort = DefaultPort
-	o.InsecureServing.BindPort = DefaultInsecurePort
 	return o
 }
 
@@ -65,15 +62,13 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&o.ClientQPSBurst, "client-qps-burst", o.ClientQPSBurst, "Client QPS burst limit for throttling requests to the API server.")
 
 	o.SecureServing.AddFlags(fs)
-	o.InsecureServing.AddFlags(fs)
 }
 
 // Validate validates all the required options.
 func (o *Options) Validate() []error {
 	var errs []error
 
 	errs = append(errs, o.SecureServing.Validate()...)
-	errs = append(errs, o.InsecureServing.Validate()...)
 
 	return errs
 }
diff --git a/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go b/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go
@@ -243,7 +243,6 @@ func LoadConfig(opts *options.Options) (*Config, error) {
 
 	var c Config
 	opts.SecureServing.ApplyTo(&c.SecureServing)
-	opts.InsecureServing.ApplyTo(&c.InsecureServing)
 
 	// Load Kube Client
 	kubeConfig, err := clientcmd.BuildConfigFromFlags("", opts.Kubeconfig)