merging: Fix the mergeStrategy=containers option #1380
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
k8s-ci-robot
added
release-note
k8s-ci-robot
added
cncf-cla: yes
jhrozek
force-pushed
the
merge_containers
branch
from
dc44c8f to
ce98774
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #1380 +/- ##
==========================================
- Coverage 46.28% 46.19% -0.10%
==========================================
Files 61 61
Lines 6263 6276 +13
==========================================
Hits 2899 2899
- Misses 3241 3254 +13
Partials 123 123 |
jhrozek
force-pushed
the
merge_containers
branch
2 times, most recently
from
cec1203 to
7108e04
Compare
jhrozek
force-pushed
the
merge_containers
branch
from
7108e04 to
ed0dc13
Compare
|
Rebased atop current main |
ccojocar
approved these changes
Jan 16, 2023
k8s-ci-robot
added
the
lgtm
jhrozek
force-pushed
the
merge_containers
branch
from
ed0dc13 to
6583375
Compare
k8s-ci-robot
removed
the
lgtm
|
Rebased atop the flatcar test fixes again |
|
Huh, this seems like a legit failure: /hold |
k8s-ci-robot
added
the
do-not-merge/hold
|
Hmm, locally the test worked fine: I'll try my luck in CI one more time.. |
jhrozek
force-pushed
the
merge_containers
branch
from
6583375 to
e7b0083
Compare
ccojocar
approved these changes
Mar 17, 2023
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ccojocar, jhrozek 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 |
The mergeStrategy=containers option was implemented wrong. Instead of merging per-container policies, it was merging policies per workload.
jhrozek
force-pushed
the
merge_containers
branch
from
e7b0083 to
b7a7497
Compare
k8s-ci-robot
removed
the
lgtm
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
Thanks for the reviews! |
k8s-ci-robot
removed
the
do-not-merge/hold
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
The mergeStrategy=containers option was implemented wrong. Instead of
merging per-container policies, it was merging policies per workload.
Which issue(s) this PR fixes:
Does this PR have test?
Yes
Special notes for your reviewer:
N/A
Does this PR introduce a user-facing change?