MLE-20428: add labels and annotation in group level #82
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
added 15 commits
June 17, 2025 23:03
pengzhouml
force-pushed
the
feature/MLE-20428-group-label-annotation
branch
from
b5b3cc0 to
c9cf1d3
Compare
pengzhouml
requested review from
barkhachoithani,
rwinieski,
sumanthravipati and
vitalykorolev
rwinieski
requested changes
Jun 23, 2025
Collaborator
rwinieski
left a comment
rwinieski
left a comment
There was a problem hiding this comment.
Please review Copilot comments.
rwinieski
approved these changes
Jun 24, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for specifying labels and annotations at the group level across multiple resources and configuration files. Key changes include:
- Incorporation of new label and annotation fields in statefulset, service, MarkLogic server definitions, CRDs, and sample configurations.
- Updates to controller predicates to reconcile on label/annotation changes.
- Minor adjustments such as timeout updates in tests and logging improvements.
Reviewed Changes
Copilot reviewed 18 out of 18 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| test/e2e/2_marklogic_cluster_test.go | Added label to the test feature and increased pod wait timeout. |
| pkg/k8sutil/statefulset.go | Merged group-level labels/annotations into object meta used to reconcile statefulsets. |
| pkg/k8sutil/service.go | Merged provided group labels into the common labels for Services. |
| pkg/k8sutil/networkPolicy.go | Removed excessive patch diff logging. |
| pkg/k8sutil/marklogicServer.go | Added label/annotation fields to MarkLogicGroup parameters and updated logging messages. |
| pkg/k8sutil/ingress.go | Removed patch diff logging for Ingress updates. |
| pkg/k8sutil/haProxy.go | Updated HAProxy resource creation/updating and enhanced logging with last applied annotations. |
| pkg/k8sutil/common.go | Introduced helper functions for HAProxy label generation and cleaned common annotations. |
| internal/controller/marklogicgroup_controller.go | Added an event filter predicate to trigger reconciliations for label/annotation changes. |
| internal/controller/marklogiccluster_controller.go | Added similar predicate logic for MarkLogicCluster and fixed reconcile conditions. |
| config/, charts/, api/v1/* | Updated CRD schemas, sample manifests, and deep copy functions to include labels and annotations. |
Comments suppressed due to low confidence (2)
internal/controller/marklogicgroup_controller.go:116
- [nitpick] The variable 'oldLables' appears to be misspelled. Consider renaming it to 'oldLabels' for consistency and clarity.
oldLables := e.ObjectOld.GetLabels()
internal/controller/marklogiccluster_controller.go:104
- [nitpick] The variable 'oldLables' is misspelled and should be renamed to 'oldLabels' to improve code clarity.
oldLables := e.ObjectOld.GetLabels()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
No description provided.