Manual Sync of #103 and #104 #309
Merged
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
Previously, only non-default namespace would get the openshift.io/cluster-monitoring label if Prometheus was enabled and it was OpenShift. Now this also gets set on the default namespace name. Relates: https://issues.redhat.com/browse/ACM-7675 https://issues.redhat.com/browse/ACM-7633 Signed-off-by: mprahl <[email protected]> (cherry picked from commit e96042ec040f09e162180bd1cac769052ca95ac1)
In commit e96042e, a change was made that made an unrelated test fail. This makes the test more specific to make it pass. Signed-off-by: mprahl <[email protected]> (cherry picked from commit 20ade74e7560aca23af1368a74cab034f131a360)
|
Kudos, SonarCloud Quality Gate passed!
|
gparvin
approved these changes
Sep 29, 2023
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: gparvin, mprahl 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.
The manual sync is required because open-cluster-management-io/governance-policy-addon-controller#104 fixes the test.
Syncing the following PRs:
Closes #307
Closes #306