github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112142 from SataQiu/fix-cm-20220831

Browse Source 
controller-manager: remove deprecated insecure serving from Config
This commit is contained in:
Kubernetes Prow Robot 2022-08-31 06:57:01 -07:00 committed by GitHub
commit 253acfc8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-controller-manager/app/config/config.go
View File

@ -32,10 +32,8 @@ type Config struct {
// LoopbackClientConfig is a config for a privileged loopback connection // LoopbackClientConfig is a config for a privileged loopback connection
LoopbackClientConfig *restclient.Config LoopbackClientConfig *restclient.Config
// TODO: remove deprecated insecure serving Authentication apiserver.AuthenticationInfo
InsecureServing *apiserver.DeprecatedInsecureServingInfo Authorization apiserver.AuthorizationInfo
Authentication apiserver.AuthenticationInfo
Authorization apiserver.AuthorizationInfo
// the general kube client // the general kube client
Client *clientset.Clientset Client *clientset.Clientset

2
test/integration/serving/serving_test.go
View File

@ -51,7 +51,7 @@ func (kubeControllerManagerTester) StartTestServer(t kubectrlmgrtesting.Logger,
if err != nil { if err != nil {
return nil, nil, nil, nil, err 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{} type cloudControllerManagerTester struct{}