Cleanup deprecated types and functions, Use modern go methods #1038
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gardener-robot
added
needs/review
gardener-robot-ci-3
added
the
reviewed/ok-to-test
takoverflow
force-pushed
the
mcm-cleanup
branch
from
187789a to
dd870dc
Compare
|
Integration Test logs: |
aaronfern
reviewed
Oct 22, 2025
There was a problem hiding this comment.
Thanks for this PR @takoverflow! very helpful and very much needed
I have a few queries, please address them.
Also, you need to re-generate pkg/client/listers/machine/v1alpha1/expansion_generated.go as I see they're still using interface{}
| ), | ||
| machineSetQueue: workqueue.NewTypedRateLimitingQueueWithConfig( | ||
| workqueue.DefaultTypedControllerRateLimiter[string](), | ||
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinetermination"}, |
There was a problem hiding this comment.
Suggested change
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinetermination"}, | |
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machineset"}, |
| ), | ||
| machineSetQueue: workqueue.NewTypedRateLimitingQueueWithConfig( | ||
| workqueue.DefaultTypedControllerRateLimiter[string](), | ||
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinetermination"}, |
There was a problem hiding this comment.
Suggested change
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machinetermination"}, | |
| workqueue.TypedRateLimitingQueueConfig[string]{Name: "machineset"}, |
| // important when we start apiserver and controller manager at the same time. | ||
| err := wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) { | ||
| immediatePoll := true | ||
| err := wait.PollUntilContextTimeout(context.Background(), time.Second, 10*time.Second, immediatePoll, func(context.Context) (bool, error) { |
There was a problem hiding this comment.
wait.PollImmediate is still used in pkg/controller/deployment_util.go and cmd/machine-controller-manager/app/controllermanager.go
Can you update these places too?
| } | ||
| data := map[string][]byte{ | ||
| bootstraptokenapi.BootstrapTokenDescriptionKey: []byte(fmt.Sprintf("A bootstrap token for machine %q generated by MachineControllerManager.", machine.Name)), | ||
| bootstraptokenapi.BootstrapTokenDescriptionKey: fmt.Appendf(nil, "A bootstrap token for machine %q generated by MachineControllerManager.", machine.Name), |
There was a problem hiding this comment.
Could this not cause a panic? I ask as Appendf expects a byte array as the first argument and passing nil may potentially cause a panic
Alternatively you could pass an empty byte array
| userDataSecret = &corev1.Secret{ | ||
| Data: map[string][]byte{ | ||
| "userData": []byte(fmt.Sprintf(userDataTemplate, "<<BOOTSTRAP_TOKEN>>", "<<MACHINE_NAME>>")), | ||
| "userData": fmt.Appendf(nil, userDataTemplate, "<<BOOTSTRAP_TOKEN>>", "<<MACHINE_NAME>>"), |
There was a problem hiding this comment.
Same as above and 3 more places in this file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This PR substitutes usages of all the deprecated functions and types with their
recommended equivalents:
TypedRateLimitingQueueinstead ofRateLimitingQueuePollUntilContextTimeoutinstead of deprecatedPollandPollImmediatefunctionsAlongwith it, also some cleanup was done that included (but not limited to):
anyinstead ofinterface{}maps.Copy(), modernrangefor loops etcAnd some unused functions were removed from
controller_suite_test.goWhich issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Would recommended looking at the PR commit by commit for easier reviewing.
Release note: