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

Add podman-remote binary to bundle #378

Merged
merged 1 commit into from
Apr 14, 2021

Conversation

guillaumerose
Copy link
Contributor

@guillaumerose guillaumerose commented Mar 30, 2021

Fix #318

The podman client exactly matches the podman version of the server.
It replicates what we do with oc.


mkdir -p podman-remote/linux
curl -L https://github.com/containers/podman/releases/download/v${version}/podman-remote-static.tar.gz | tar -zx -C podman-remote/linux podman-remote-static
mv podman-remote/linux/podman-remote-static podman-remote/linux/podman
Copy link
Member

Choose a reason for hiding this comment

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

Should we say podman-remote or podman for the binary (all the platform)? Release page have podman-remote name for all the release artifacts.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes good question. The macOS and Windows packages contain podman directly, not podman-remote.

Copy link
Contributor

Choose a reason for hiding this comment

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

podman and podman-remote are 2 different binaries, so let's keep the podman-remote name, naming it podman is going to be confusing.

$ sha256sum /usr/bin/podman*
c553c90f4268fa2e01be30361b24367a977f555a7a25b188e8f4bb0d31927012  /usr/bin/podman
5b057ddde34128594580f216b2c36d5eb710a872c442159ee7156a4eba5377bb  /usr/bin/podman-remote

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed 👍

Copy link
Collaborator

Choose a reason for hiding this comment

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

This was part of a discussion that Dan Walsh had strong opinions about. He didn't allow at that time to call the binary podman as that is NOT what it is.

Copy link
Contributor

Choose a reason for hiding this comment

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

This PR is now using the same name as the upstream tarballs, they can fix that naming if it's wrong and we'll follow suit, but I don't think we should block this PR on this?

Copy link
Contributor

Choose a reason for hiding this comment

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

3.1.0 was released yesterday, but has no builds, https://github.com/containers/podman/releases/tag/v3.1.0 hopefully they'll be coming later.

@praveenkumar
Copy link
Member

/retest

Copy link
Collaborator

@gbraad gbraad left a comment

Choose a reason for hiding this comment

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

/onhold

Binary name is under discussion

@guillaumerose
Copy link
Contributor Author

/retest

@praveenkumar
Copy link
Member

as per https://github.com/containers/podman/pull/9381/files#diff-7e8ec8aae93ed3672946c8150f80f18d724d50ee1dfff70230f3b7c6d3f4f423R9-R19 looks like they are going with podman (for win and mac) and podman-remote for linux so this PR make sense.

/lgtm

@praveenkumar
Copy link
Member

/hold cancel

@praveenkumar
Copy link
Member

/cherry-pick 4.7

@openshift-cherrypick-robot

@praveenkumar: once the present PR merges, I will cherry-pick it on top of 4.7 in a new PR and assign it to you.

In response to this:

/cherry-pick 4.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.

@praveenkumar
Copy link
Member

/unhold

@gbraad
Copy link
Collaborator

gbraad commented Apr 14, 2021 via email


if [ -n "${SNC_GENERATE_MACOS_BUNDLE}" ]; then
mkdir -p podman-remote/mac
curl -L https://github.com/containers/podman/releases/download/v${version}/podman-remote-release-darwin.zip > podman-remote/mac/podman.zip
Copy link
Contributor

Choose a reason for hiding this comment

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

this could use curl -O -L instead of > podman-remote/mac/podman.zip

Copy link
Contributor

@cfergeau cfergeau left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@cfergeau
Copy link
Contributor

Maybe add this:

$ git diff
diff --git a/crc-bundle-info.json.sample b/crc-bundle-info.json.sample
index 1281c6a..a5d0d95 100644
--- a/crc-bundle-info.json.sample
+++ b/crc-bundle-info.json.sample
@@ -82,7 +82,7 @@
       {
         # Name of the file
        "name": "oc"
-       # What kind of file this is, valid types are 'oc-executable'
+       # What kind of file this is, valid types are 'oc-executable', 'podman-executable'
        "type": "oc-executable"
        "size": "72728632"
        "sha256sum": "983f0883a6dffd601afa663d10161bfd8033fd6d45cf587a9cb22e9a681d6047"

The podman client exactly matches the podman version of the server.
It replicates what we do with oc.
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau, guillaumerose

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 [cfergeau,guillaumerose]

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

@guillaumerose
Copy link
Contributor Author

conformance tests unhappy

/retest

@openshift-cherrypick-robot

@praveenkumar: new pull request created: #394

In response to this:

/cherry-pick 4.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.

guillaumerose added a commit to guillaumerose/crc that referenced this pull request Apr 16, 2021
guillaumerose added a commit to guillaumerose/crc that referenced this pull request Apr 19, 2021
guillaumerose added a commit to guillaumerose/crc that referenced this pull request Apr 26, 2021
praveenkumar pushed a commit to crc-org/crc that referenced this pull request Apr 27, 2021
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.

Add podman client in the bundle
6 participants