Merge pull request #2468 from k8s-infra-cherrypick-robot/cherry-pick-2464-to-release-0.16

k8s-ci-robot · web-flow · commit 240440accec6 · 2023-09-04T02:11:49.000-07:00
[release-0.16] 🐛 Use http client from leaderElectionConfig
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
@@ -364,7 +364,11 @@ func New(config *rest.Config, options Options) (Manager, error) {
 		if err != nil {
 			return nil, err
 		}
-		leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, cluster.GetHTTPClient(), scheme, options.Logger.WithName("events"), options.makeBroadcaster)
+		httpClient, err := rest.HTTPClientFor(options.LeaderElectionConfig)
+		if err != nil {
+			return nil, err
+		}
+		leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, httpClient, scheme, options.Logger.WithName("events"), options.makeBroadcaster)
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,11 @@ func New(config *rest.Config, options Options) (Manager, error) {`
`364`	`364`	`if err != nil {`
`365`	`365`	`return nil, err`
`366`	`366`	`}`
`367`		`- leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, cluster.GetHTTPClient(), scheme, options.Logger.WithName("events"), options.makeBroadcaster)`
	`367`	`+ httpClient, err := rest.HTTPClientFor(options.LeaderElectionConfig)`
	`368`	`+ if err != nil {`
	`369`	`+ return nil, err`
	`370`	`+ }`
	`371`	`+ leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, httpClient, scheme, options.Logger.WithName("events"), options.makeBroadcaster)`
`368`	`372`	`if err != nil {`
`369`	`373`	`return nil, err`
`370`	`374`	`}`