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

chore: update docker to v25 #1140

Merged
merged 1 commit into from
Feb 23, 2024
Merged

chore: update docker to v25 #1140

merged 1 commit into from
Feb 23, 2024

Conversation

matejvasek
Copy link
Contributor

update docker to v25

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 13, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 13, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@matejvasek
Copy link
Contributor Author

/test all

@matejvasek
Copy link
Contributor Author

/retest

@matejvasek
Copy link
Contributor Author

/test all

@matejvasek
Copy link
Contributor Author

/retest-required

@matejvasek
Copy link
Contributor Author

/test security

@matejvasek
Copy link
Contributor Author

/retest

@matejvasek
Copy link
Contributor Author

/test all

@matejvasek matejvasek marked this pull request as ready for review February 13, 2024 19:22
@matejvasek
Copy link
Contributor Author

@coreydaley

@matejvasek
Copy link
Contributor Author

/cc @coreydaley

@matejvasek matejvasek changed the title [WIP] chore: update docker to v25 chore: update docker to v25 Feb 13, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 13, 2024
@coreydaley
Copy link
Member

/assign @sayan-biswas @adambkaplan

@matejvasek
Copy link
Contributor Author

@coreydaley is the security check failure really related to my PR?

@coreydaley
Copy link
Member

@matejvasek No, and the security check is also option, so it will not stop the pull request from merging.

@matejvasek matejvasek mentioned this pull request Feb 14, 2024
Merged
@matejvasek
Copy link
Contributor Author

@coreydaley We need this to get rid off some CVE reports in RH jira. The CVEs do not really affects us but we do not want to see the warnings.

adambkaplan
adambkaplan requested changes Feb 15, 2024
View reviewed changes
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

The update to the new client constructor is not a clean port from v24 to v25. I'm concerned that this is exercised in the s2i build code paths, which we don't have great test coverage for at present. OpenShift and the s2i container images for Tekton, Shipwright, and KNative use the s2i generate code paths, which we can verify in CI.

pkg/docker/docker.go Show resolved Hide resolved
pkg/docker/docker.go Outdated Show resolved Hide resolved
pkg/docker/docker.go Show resolved Hide resolved
@matejvasek
Copy link
Contributor Author

matejvasek commented Feb 16, 2024 •
edited
Loading

@adambkaplan wort case: I can use the old deprecated ctor and override linter error.
EDIT: I cannot use old ctor. We need WithAPIVersionNegotiation().

@matejvasek
Copy link
Contributor Author

PTAL @adambkaplan

adambkaplan
adambkaplan requested changes Feb 23, 2024
View reviewed changes
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

One last suggestion, otherwise looks good.

What started out as a chore feels like a net new feature! I don't think it warrants any additional documentation beyond a release note, but after this lands we should increase the minor version number on the next release (to 1.4.0).

pkg/docker/docker.go Outdated Show resolved Hide resolved
@adambkaplan
Copy link
Contributor

adambkaplan commented Feb 23, 2024 •
edited
Loading

/assign @sayan-biswas

Feel free to use /approve to green-light merge - I can add the LGTM once the comment suggestion is added and commits are squashed.

@matejvasek - in your commit message please explain why we need API version negotiation for docker. This makes it easier for future maintainers to understand why the change was introduced, without having to chase down this pull request and unroll the comments.

@matejvasek
chore: update docker to v25
30302e1 
Change details:
Use newer ctor for docker client, the ctor negotiates API so it works
also with older version of daemon. The ability to force API version via
DOCKER_API_VERSION is preserved.

Signed-off-by: Matej Vašek <mvasek@redhat.com>
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 23, 2024

@matejvasek: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 30302e1 link false /test security

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@sayan-biswas
Copy link
Contributor

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2024
adambkaplan
adambkaplan approved these changes Feb 23, 2024
View reviewed changes
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

/lgtm

Thank you!

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, matejvasek, sayan-biswas

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 625a537 into openshift:master Feb 23, 2024
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adambkaplan adambkaplan adambkaplan approved these changes

@divyansh42 divyansh42 Awaiting requested review from divyansh42

@jkhelil jkhelil Awaiting requested review from jkhelil

@coreydaley coreydaley Awaiting requested review from coreydaley

Assignees

@adambkaplan adambkaplan

@sayan-biswas sayan-biswas

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matejvasek @coreydaley @adambkaplan @sayan-biswas