Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🤖 Sync from open-cluster-management-io/config-policy-controller: #172 #622

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

magic-mirror-bot[bot]
Copy link

In the example of a Pod definition in a Deployment, you could set
`stdin: false` and `tty: false` for the container in a ConfigurationPolicy,
but the API server would omit them from the return value. This would
lead to the merged map and existing map to have a different length,
and causing the comparison to end early. This was wrong in this case
since a missing boolean should be treated the same as `false` set in the
ConfigurationPolicy.

Relates:
https://issues.redhat.com/browse/ACM-8391

Signed-off-by: mprahl <mprahl@users.noreply.github.com>
(cherry picked from commit e88b230)
Copy link

openshift-ci bot commented Nov 2, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: magic-mirror-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign justinkuli for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

sonarcloud bot commented Nov 2, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@magic-mirror-bot magic-mirror-bot bot merged commit e75c1a4 into main Nov 2, 2023
14 of 15 checks passed
@magic-mirror-bot magic-mirror-bot bot deleted the magic-mirror-main-1698959875772 branch November 2, 2023 21:44
@mprahl
Copy link
Contributor

mprahl commented Nov 3, 2023

/cherry-pick release-2.9

@mprahl
Copy link
Contributor

mprahl commented Nov 3, 2023

/cherry-pick release-2.8

@mprahl
Copy link
Contributor

mprahl commented Nov 3, 2023

/cherry-pick release-2.7

@openshift-cherrypick-robot

@mprahl: new pull request created: #623

In response to this:

/cherry-pick release-2.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@mprahl: #622 failed to apply on top of branch "release-2.8":

Applying: Handle values omitted from the API server in arrays of objects
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller_test.go
M	controllers/configurationpolicy_utils.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/configurationpolicy_utils.go
Auto-merging controllers/configurationpolicy_controller_test.go
CONFLICT (content): Merge conflict in controllers/configurationpolicy_controller_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Handle values omitted from the API server in arrays of objects
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@mprahl: #622 failed to apply on top of branch "release-2.7":

Applying: Handle values omitted from the API server in arrays of objects
Using index info to reconstruct a base tree...
M	controllers/configurationpolicy_controller_test.go
M	controllers/configurationpolicy_utils.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/configurationpolicy_utils.go
Auto-merging controllers/configurationpolicy_controller_test.go
CONFLICT (content): Merge conflict in controllers/configurationpolicy_controller_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Handle values omitted from the API server in arrays of objects
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants