From 1ae5237a66a74266595d78a14870e8bc4a593c2f Mon Sep 17 00:00:00 2001 From: SataQiu Date: Wed, 31 Aug 2022 15:45:40 +0800 Subject: [PATCH] controller-manager: remove deprecated insecure serving from Config --- cmd/kube-controller-manager/app/config/config.go | 6 ++---- test/integration/serving/serving_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/kube-controller-manager/app/config/config.go b/cmd/kube-controller-manager/app/config/config.go index 2d2db31801f..3034f288d91 100644 --- a/cmd/kube-controller-manager/app/config/config.go +++ b/cmd/kube-controller-manager/app/config/config.go @@ -32,10 +32,8 @@ type Config struct { // LoopbackClientConfig is a config for a privileged loopback connection LoopbackClientConfig *restclient.Config - // TODO: remove deprecated insecure serving - InsecureServing *apiserver.DeprecatedInsecureServingInfo - Authentication apiserver.AuthenticationInfo - Authorization apiserver.AuthorizationInfo + Authentication apiserver.AuthenticationInfo + Authorization apiserver.AuthorizationInfo // the general kube client Client *clientset.Clientset diff --git a/test/integration/serving/serving_test.go b/test/integration/serving/serving_test.go index 0e2bd16e07b..f6e78e2b1ba 100644 --- a/test/integration/serving/serving_test.go +++ b/test/integration/serving/serving_test.go @@ -51,7 +51,7 @@ func (kubeControllerManagerTester) StartTestServer(t kubectrlmgrtesting.Logger, if err != nil { return nil, nil, nil, nil, err } - return gotResult.Options.SecureServing, gotResult.Config.SecureServing, gotResult.Config.InsecureServing, gotResult.TearDownFn, err + return gotResult.Options.SecureServing, gotResult.Config.SecureServing, nil, gotResult.TearDownFn, err } type cloudControllerManagerTester struct{}