chore: Fix returning non-empty reconcile result and error #618
Conversation
This file contains 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
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Fixes #N/A
Description
Since controller-runtime kubernetes-sigs/controller-runtime#2451, a warning will be logged if a controller returns an error and a non-zero result (i.e. a result with a RequeueAfter).
This PR changes the logic of our current controllers to not return both a non-zero result and an error at the same time to prevent warnings from being fired.
2023-10-20T01:28:53.2764885Z logger.go:130: 2023-10-20T01:28:53.275Z INFO common/expectations.go:573 2023-10-20T01:28:49.102Z DEBUG controller.awsnodetemplate discovered security groups {"commit": "dce7385", "awsnodetemplate": "serpentsunset-29-ahjs7gn4mu", "security-groups": ["sg-0273da947dae25bb0", "sg-09513f2623d9d9b79"]} 2023-10-20T01:28:53.2773218Z 2023-10-20T01:28:49.158Z INFO controller Warning: Reconciler returned both a non-zero result and a non-nil error. The result will always be ignored if the error is non-nil and the non-nil error causes reqeueuing with exponential backoff. For more details, see: https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/reconcile#Reconciler {"commit": "dce7385", "controller": "awsnodetemplate", "controllerGroup": "karpenter.k8s.aws", "controllerKind": "***NodeTemplate", "***NodeTemplate": {"name":"serpentsunset-29-ahjs7gn4mu"}, "namespace": "", "name": "serpentsunset-29-ahjs7gn4mu", "reconcileID": "60c54480-e547-4b51-b312-4f2a603b1520"} 2023-10-20T01:28:53.2781222Z 2023-10-20T01:28:49.158Z ERROR controller Reconciler error {"commit": "dce7385", "controller": "awsnodetemplate", "controllerGroup": "karpenter.k8s.aws", "controllerKind": "***NodeTemplate", "***NodeTemplate": {"name":"serpentsunset-29-ahjs7gn4mu"}, "namespace": "", "name": "serpentsunset-29-ahjs7gn4mu", "reconcileID": "60c54480-e547-4b51-b312-4f2a603b1520", "error": "describing images, InvalidUserID.Malformed: Invalid user id: \"fakeOwnerValue\"\n\tstatus code: 400, request id: 197b5477-2067-4b51-9c8e-9162f8816402"}How was this change tested?
make presubmitBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.