Sync 192 193 194 #701
Merged
Sync 192 193 194 #701
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
ComplianceType and RemediationActions were previously checked inline with string comparisons. This is more easily readable, and potentially better able to be changed in the future. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit e6deab6)
It was decided to use RawExtension for the "embedded" Subscription and OperatorGroup, this can better allow for possible version skew in the future. The CRD validation would be limited inside the policy framework anyway because in a Policy, the raw content has no validation. This also removes some fields which are not expected to be functional in the initial release. The `build*` functions have been updated to use the RawExtension, and may have been adjusted for some other incoming changes. Some other temporary changes were made to resolve compilation errors and unit tests, but the OperatorPolicy "e2e" tests were not considered. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 362ca28)
The previous version of this function was only applicable to a Policy owning a ConfigurationPolicy. Now it is more broadly applicable. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 7ef6c39)
The general plan is to continue adding `handle*` functions for the other resources that an OperatorPolicy needs to examine. Each handle function will update the policy's status (with conditions and relatedObjects), and possibly emit compliance events. This may cause more compliance events "than usual" compared to other controllers, but I think the separation of concerns will help each function be more maintainable. My hope is that some of the `*Cond` and `*Obj` functions in the status section can be reused in the future handlers. There was already overlap between the Subscription and OperatorGroup, so this seemed reasonable. To check if the Subscription/OperatorGroup on the cluster matches what is desired by the policy, a function `handleKeys` was created that can be used for OperatorPolicies and ConfigurationPolicies. Refs: - https://issues.redhat.com/browse/ACM-9283 Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 56ace86)
ref: https://issues.redhat.com/browse/ACM-9734 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com> (cherry picked from commit 4bfdf6e)
Loop variables are re-used in different iterations, which means taking the address of one can lead to unexpected results. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 2d589d4)
This might prevent conditions of the same type from being duplicated in the status. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 1895478)
There was already one like this when the OperatorGroup was not being specified in the OperatorPolicy, but this helps keep things complete. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com> (cherry picked from commit 3da5031)
|
dhaiducek
approved these changes
Feb 1, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhaiducek, JustinKuli The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
Syncing:
Closes #696 (192 failed to sync because of an issue that is fixed in 194)