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

🌱 Update docker to v20.10.16 #6552

Merged
merged 1 commit into from
May 27, 2022

Conversation

mkumatag
Copy link
Member

What this PR does / why we need it:

This PR will update the docker dependency to the latest available version

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 26, 2022
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label May 26, 2022
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

+6 −765

Wow - I wonder why there's such a big diff for the small change?

@mkumatag
Copy link
Member Author

+6 −765

Wow - I wonder why there's such a big diff for the small change?

seems like nobody ran go mod tidy before :P there were some unwanted deps!

@killianmuldoon
Copy link
Contributor

On the docker side? We run it as part of make generate-modules and there's no diff when I run it on current main.

@mkumatag
Copy link
Member Author

On the docker side? We run it as part of make generate-modules and there's no diff when I run it on current main.

you are right, that is what I was wondering, I see this logic to verify that here

@killianmuldoon
Copy link
Contributor

killianmuldoon commented May 26, 2022

That project actually uses a vendor.mod instead of a go.mod, which means (I think) they have to do manual cleanups to get rid of dependencies. It looks like there's a few of those in the git history

Looks like we're reaping the benefits -thanks for removing so much unneeded dependencies from the repo! 😄

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2022
@mkumatag
Copy link
Member Author

/assign @justinsb

@mkumatag
Copy link
Member Author

/assign @fabriziopandini

@sbueringer
Copy link
Member

Thx!

/retitle 🌱 Update docker to v20.10.16
/approve
/lgtm

@k8s-ci-robot k8s-ci-robot changed the title 🌱 update docker mod to v20.10.16 🌱 Update docker to v20.10.16 May 27, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 27, 2022
@k8s-ci-robot k8s-ci-robot merged commit 5ed6e67 into kubernetes-sigs:main May 27, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.2 milestone May 27, 2022
@mkumatag mkumatag deleted the update-docker branch May 27, 2022 09:11
@mkumatag
Copy link
Member Author

/cherrypick release-1.1

@k8s-infra-cherrypick-robot

@mkumatag: #6552 failed to apply on top of branch "release-1.1":

Applying: update docker mod to v20.10.16
Using index info to reconstruct a base tree...
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update docker mod to v20.10.16
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.1

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants