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

feat(runc-shim): add a version flag #167

Merged
merged 1 commit into from
Aug 24, 2023
Merged

feat(runc-shim): add a version flag #167

merged 1 commit into from
Aug 24, 2023

Conversation

Mossaka
Copy link
Member

@Mossaka Mossaka commented Aug 3, 2023 •
edited
Loading

This PR adds two things

  1. expose the parse function from containerd-shim crate and move the namespace check to the boostrap function
  2. implement git hash for helping the version information on the runc-shim.

Closes #120

@mxpv mxpv added the C-runc-shim Runc shim label Aug 8, 2023
mxpv
mxpv reviewed Aug 9, 2023
View reviewed changes
crates/runc-shim/build.rs Outdated Show resolved Hide resolved
@Mossaka Mossaka requested a review from mxpv August 9, 2023 22:00
@mxpv mxpv requested a review from Burning1020 August 9, 2023 22:33
@Burning1020
Copy link
Member

OK, I'll review it ASAP

Burning1020
Burning1020 suggested changes Aug 10, 2023
View reviewed changes
Copy link
Member

@Burning1020 Burning1020 left a comment

Choose a reason for hiding this comment

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

Could you please rebase your commits? Because there is a Merge commit.

crates/shim/src/args.rs Outdated Show resolved Hide resolved
crates/runc-shim/src/main.rs Show resolved Hide resolved
crates/runc-shim/src/main.rs Show resolved Hide resolved
@github-actions github-actions bot added the C-shim Containerd shim label Aug 10, 2023
Burning1020
Burning1020 reviewed Aug 15, 2023
View reviewed changes
crates/runc-shim/src/main.rs Show resolved Hide resolved
crates/runc-shim/src/main.rs Show resolved Hide resolved
crates/runc-shim/build.rs Show resolved Hide resolved
@Mossaka Mossaka force-pushed the version branch 2 times, most recently from a96759e to ed0e9d1 Compare August 18, 2023 21:24
@jsturtevant
Copy link
Contributor

you've hit #147 (comment) with the integration tests.

@Mossaka Mossaka mentioned this pull request Aug 18, 2023
Closed
Burning1020
Burning1020 approved these changes Aug 21, 2023
View reviewed changes
crates/runc-shim/src/main.rs Show resolved Hide resolved
Burning1020
Burning1020 reviewed Aug 21, 2023
View reviewed changes
Copy link
Member

@Burning1020 Burning1020 left a comment

Choose a reason for hiding this comment

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

LGTM

@jsturtevant
Copy link
Contributor

@Mossaka a rebase should fix the integration test failing

@Mossaka
Copy link
Member Author

Mossaka commented Aug 22, 2023

Let me try rerunning the CI

@Mossaka Mossaka closed this Aug 22, 2023
@Mossaka Mossaka reopened this Aug 22, 2023
@Mossaka Mossaka requested a review from mxpv August 22, 2023 22:35
@Mossaka
Copy link
Member Author

Mossaka commented Aug 22, 2023

Once we get this PR merged, can we get a new release cut?

@Mossaka
Copy link
Member Author

Mossaka commented Aug 24, 2023

@mxpv could we merge this PR?

@mxpv mxpv merged commit 621ebbb into containerd:main Aug 24, 2023
25 of 28 checks passed
@Mossaka Mossaka deleted the version branch August 24, 2023 02:12
@Mossaka Mossaka mentioned this pull request Aug 24, 2023
Merged
@devigned devigned mentioned this pull request Apr 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsturtevant jsturtevant jsturtevant left review comments

@Burning1020 Burning1020 Burning1020 approved these changes

@mxpv mxpv Awaiting requested review from mxpv

Assignees
No one assigned
Labels
C-runc-shim Runc shim C-shim Containerd shim
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Proposal: Add --version flag to print the build info of the binary
4 participants
@Mossaka @Burning1020 @jsturtevant @mxpv