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

Use mergo for syscall merge #1587

Merged
merged 1 commit into from
Mar 31, 2023

Conversation

saschagrunert
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

The merging itself is not that intelligent any more, but we preserve possible args and error return values. It also makes the merge more simple, while we still sort the syscall names and actions.

Which issue(s) this PR fixes:

None

Does this PR have test?

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Fixed overriding args and error return values when merging profiles.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 30, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 30, 2023
@saschagrunert saschagrunert force-pushed the use-mergo branch 2 times, most recently from cf0bcf4 to d19b9b2 Compare March 30, 2023 12:55
@saschagrunert saschagrunert deleted the use-mergo branch March 30, 2023 13:06
@saschagrunert saschagrunert restored the use-mergo branch March 30, 2023 13:33
@saschagrunert saschagrunert reopened this Mar 30, 2023
The merging itself is not that intelligent any more, but we preserve
possible args and error return values. It also makes the merge more
simple, while we still sort the syscall names and actions.

Signed-off-by: Sascha Grunert <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #1587 (7bd8416) into main (5cfd263) will decrease coverage by 0.17%.
The diff coverage is 66.66%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1587      +/-   ##
==========================================
- Coverage   48.97%   48.81%   -0.17%     
==========================================
  Files          69       69              
  Lines        6748     6744       -4     
==========================================
- Hits         3305     3292      -13     
- Misses       3318     3324       +6     
- Partials      125      128       +3     

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 31, 2023
@ccojocar
Copy link
Contributor

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ccojocar, saschagrunert

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:
  • OWNERS [ccojocar,saschagrunert]

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

@k8s-ci-robot k8s-ci-robot merged commit 24e5a98 into kubernetes-sigs:main Mar 31, 2023
@saschagrunert saschagrunert deleted the use-mergo branch March 31, 2023 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants