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 #2160

Merged
merged 4 commits into from
Feb 28, 2024
Merged

chore: update docker to v25 #2160

merged 4 commits into from
Feb 28, 2024

Conversation

matejvasek
Copy link
Contributor

No description provided.

@knative-prow Knative Prow
Copy link

knative-prow 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

@knative-prow knative-prow 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
@knative-prow knative-prow bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 13, 2024
@codecov Codecov
Copy link

codecov bot commented Feb 13, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 33.33333% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 65.14%. Comparing base (bd4a334) to head (0e13365).
Report is 15 commits behind head on main.

❗ Current head 0e13365 differs from pull request most recent head 453139b. Consider uploading reports for the commit 453139b to get more accurate results

Files Patch % Lines
pkg/docker/runner.go 33.33% 0 Missing and 2 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2160      +/-   ##
==========================================
+ Coverage   63.09%   65.14%   +2.04%     
==========================================
  Files         108      108              
  Lines       13918    13918              
==========================================
+ Hits         8782     9067     +285     
+ Misses       4288     3952     -336     
- Partials      848      899      +51
Flag Coverage Δ
e2e-test 37.32% <33.33%> (ø)
e2e-test-oncluster 30.57% <0.00%> (?)
e2e-test-oncluster-runtime 26.83% <0.00%> (?)
e2e-test-runtime-go 25.58% <0.00%> (?)
e2e-test-runtime-node 26.57% <0.00%> (?)
e2e-test-runtime-python 26.57% <0.00%> (?)
e2e-test-runtime-quarkus 26.68% <0.00%> (?)
e2e-test-runtime-rust 25.55% <0.00%> (?)
e2e-test-runtime-springboot 25.71% <0.00%> (?)
e2e-test-runtime-typescript 26.68% <0.00%> (?)
integration-tests 51.84% <33.33%> (+2.02%) ⬆️
unit-tests-macos-latest 48.84% <0.00%> (ø)
unit-tests-ubuntu-latest 49.59% <0.00%> (+0.02%) ⬆️
unit-tests-windows-latest 48.89% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@matejvasek matejvasek force-pushed the update-docker-v25 branch 2 times, most recently from 395ae87 to 7928e24 Compare February 13, 2024 22:05
@matejvasek
Copy link
Contributor Author

This depends on openshift/source-to-image#1140

matejvasek
matejvasek commented Feb 14, 2024
View reviewed changes
pkg/builders/s2i/builder_test.go
Comment on lines +503 to +505
func (n notFoundErr) NotFound() {
panic("just a marker interface")
Copy link
Contributor Author

@matejvasek matejvasek Feb 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Just a note: this change was tricky, it was not forced by compiler error like rest.
There was just failing test because the mock error stopped being "not found" error according to docker semantic.

Copy link
Contributor Author

@matejvasek matejvasek Feb 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

For the future I added type assert below (in form of assigment).

@matejvasek matejvasek requested review from gauron99 and lkingland and removed request for vyasgun February 14, 2024 02:53
@matejvasek
chore: update docker to v25
907243a 
Signed-off-by: Matej Vašek <mvasek@redhat.com>
matejvasek
matejvasek commented Feb 14, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@matejvasek
Copy link
Contributor Author

/test all

@matejvasek
chore: update pack dep
47cac85 
Signed-off-by: Matej Vašek <mvasek@redhat.com>
dsimansk
dsimansk reviewed Feb 15, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@matejvasek
chore: unpin moby/buildkit
0e13365 
Signed-off-by: Matej Vašek <mvasek@redhat.com>
@matejvasek matejvasek marked this pull request as ready for review February 22, 2024 13:42
@knative-prow knative-prow 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 22, 2024
@dsimansk
Copy link
Contributor

/approve
/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Feb 22, 2024
@dsimansk
Copy link
Contributor

Feel free to unhold, adding it just in case anyone wants to look at the PR.

/hold

@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 Feb 22, 2024
@matejvasek
fixup: use upstream source-to-image
453139b 
Signed-off-by: Matej Vašek <mvasek@redhat.com>
@knative-prow knative-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2024
@matejvasek
Copy link
Contributor Author

PTAL @gauron99 @lkingland @matzew

@matejvasek matejvasek requested review from dsimansk and matzew and removed request for navidshaikh and rhuss February 27, 2024 23:34
dsimansk
dsimansk reviewed Feb 28, 2024
View reviewed changes
go.mod
Comment on lines -8 to -10
// Pin moby/buildkit until docker/docker is upgraded
replace github.com/moby/buildkit => github.com/moby/buildkit v0.11.6

Copy link
Contributor

@dsimansk dsimansk Feb 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

👍 and no fork replace for s2i as well, nice!

dsimansk
dsimansk approved these changes Feb 28, 2024
View reviewed changes
Copy link
Contributor

@dsimansk dsimansk left a comment

Choose a reason for hiding this comment

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

For other reviewers.
/hold

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2024
@knative-prow Knative Prow
Copy link

knative-prow bot commented Feb 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, 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 [dsimansk,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 Feb 28, 2024
@knative-prow knative-prow bot merged commit e2ea83c into knative:main Feb 28, 2024
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsimansk dsimansk dsimansk approved these changes

@gauron99 gauron99 Awaiting requested review from gauron99

@lkingland lkingland Awaiting requested review from lkingland

@matzew matzew Awaiting requested review from matzew

Assignees

@dsimansk dsimansk

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

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