Refactor: Consolidate duplicate getIntegrationKit code #6417
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
Refactored duplicate getIntegrationKit implementations to use the existing kubernetes.GetIntegrationKit utility function. This reduces code duplication and centralizes the IntegrationKit retrieval logic. Changes: - pkg/trait/util.go: Use kubernetes.GetIntegrationKit, remove unused ctrl import - pkg/trait/jvm.go: Use kubernetes.GetIntegrationKit, remove unused ctrl import - pkg/cmd/promote.go: Simplify to use kubernetes.GetIntegrationKit Fixes: apache#6413
squakez
approved these changes
Dec 14, 2025
Contributor
squakez
left a comment
squakez
left a comment
There was a problem hiding this comment.
Thanks for the contribution! If you can, just revert the check I commented in the review which I think it was clearer before.
pkg/trait/jvm.go
Outdated
|
|
||
| func (t *jvmTrait) getIntegrationKit(e *Environment) (*v1.IntegrationKit, error) { | ||
| kit := e.IntegrationKit | ||
| if e.IntegrationKit != nil { |
Contributor
There was a problem hiding this comment.
This check is redundant. We can keep as it was.
squakez
approved these changes
Dec 14, 2025
Contributor
|
Please run |
gansheer
approved these changes
Dec 14, 2025
squakez
approved these changes
Dec 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Summary
getIntegrationKitimplementations to use the existingkubernetes.GetIntegrationKitutility functionctrlimport frompkg/trait/util.goandpkg/trait/jvm.gopkg/cmd/promote.goto use the centralized utilityFiles Changed
pkg/trait/util.go: Usekubernetes.GetIntegrationKit, remove unusedctrlimportpkg/trait/jvm.go: Usekubernetes.GetIntegrationKit, remove unusedctrlimportpkg/cmd/promote.go: Simplify to usekubernetes.GetIntegrationKitTest Plan
go build ./pkg/trait/... ./pkg/cmd/...passesFixes #6413