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.

Sign up for GitHub

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

Jump to bottom

Fix S2I build with podman #1014

Merged
merged 1 commit into from
May 12, 2022
Merged

Fix S2I build with podman #1014

merged 1 commit into from
May 12, 2022

Conversation

matejvasek
Copy link
Contributor

Workaround a bug in podman:
containers/podman#13770

Changes

  • 🐛 Fix s2i build with podman
fix: s2i build with podman

@matejvasek matejvasek requested a review from lkingland May 11, 2022 17:28
@knative-prow knative-prow bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 11, 2022
@codecov
Copy link

codecov bot commented May 11, 2022 •
edited
Loading

Codecov Report

Merging #1014 (1783153) into main (1fd60ee) will decrease coverage by 0.35%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main    #1014      +/-   ##
==========================================
- Coverage   46.77%   46.41%   -0.36%     
==========================================
  Files          57       58       +1     
  Lines        7508     7568      +60     
==========================================
+ Hits         3512     3513       +1     
- Misses       3667     3723      +56     
- Partials      329      332       +3
Impacted Files Coverage Δ
s2i/builder.go 26.15% <0.00%> (-0.84%) ⬇️
s2i/docker_client_wrapper.go 0.00% <0.00%> (ø)
invoke.go 47.72% <0.00%> (-5.27%) ⬇️
cmd/invoke.go 33.77% <0.00%> (-1.04%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1fd60ee...1783153. Read the comment docs.

@matejvasek matejvasek force-pushed the fix-q-s2i branch 2 times, most recently from 67a1b21 to 2ede6ee Compare May 11, 2022 19:00
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented May 11, 2022 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: matejvasek / name: Matej Vasek (2ede6ee)

lkingland
lkingland reviewed May 12, 2022
View reviewed changes
Copy link
Member

@lkingland lkingland left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very glad to see! Two minor questions

  1. I see there is a generated file, but no indication of how it was generated or how to update the generation should the API change. Can we have (ideally) a generator included in the codebase or (at least) a comment on how to recreate this generation in the future?
  2. The generated file includes a mapping of every method from the parent to the implementation to approximate a subclass. Could we try Go's Struct Embedding to avoid having to generate the file in the first place?

/lgtm
/hold for potential use of struct embedding; if that works

@matejvasek
Fix S2I build with podman.
1783153 
Workaround a bug in podman:
containers/podman#13770

Signed-off-by: Matej Vasek <mvasek@redhat.com>
@knative-prow knative-prow bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 12, 2022
@matejvasek
Copy link
Contributor Author

/hold for tests

@knative-prow knative-prow bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2022
lkingland
lkingland approved these changes May 12, 2022
View reviewed changes
Copy link
Member

@lkingland lkingland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a winner to me
/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2022
@knative-prow
Copy link

knative-prow bot commented May 12, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lkingland, matejvasek

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 [lkingland,matejvasek]

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

@matejvasek
Copy link
Contributor Author

/unhold

@knative-prow knative-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2022
@knative-prow knative-prow bot merged commit e830e09 into knative:main May 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lkingland lkingland lkingland approved these changes

@lance lance Awaiting requested review from lance

@zroubalik zroubalik Awaiting requested review from zroubalik

Assignees

@lkingland lkingland

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@matejvasek @lkingland