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

🐛 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc #9038

Merged
merged 1 commit into from
Jul 21, 2023
Merged

🐛 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc #9038

merged 1 commit into from
Jul 21, 2023

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 21, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 21, 2023
@sbueringer sbueringer changed the title Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc 🐛 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc Jul 21, 2023
@sbueringer
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

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

@sbueringer
Copy link
Member Author

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.6

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.

@sbueringer
Copy link
Member Author

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.5

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.

@killianmuldoon
Copy link
Contributor

/cherry-pick release-1.4

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.4

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.

@killianmuldoon
Copy link
Contributor

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.3

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.

chrischdi
chrischdi reviewed Jul 21, 2023
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 677b8311ff76d7063e44f6d0cd98ae8fcec34a9e

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 2023
@k8s-ci-robot k8s-ci-robot requested a review from chrischdi July 21, 2023 14:29
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 21, 2023
@killianmuldoon
Copy link
Contributor

/test

@killianmuldoon
Copy link
Contributor

/test pull-cluster-api-e2e-full-main

@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot Jul 21, 2023
sbueringer
sbueringer commented Jul 21, 2023
View reviewed changes
hack/tools/tilt-prepare/main.go
return err
}
klog.Infof("[%s] resolved latest Helm Chart version to %q\n", prefix, helmChartVersion)
return errors.New("Helm Chart version must be set")
Copy link
Member Author

@sbueringer sbueringer Jul 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I had to get rid of the helm dependency as it's not compatible with the new docker/docker version (because they both depend on incompatible versions of oras.land/oras-go)

We previously used this code to pull latest Helm Chart versions. But we stopped using that to have a stable dev environment.

I think it's fine to drop this code as we don't want to go back to a dev-env that can break any day when new Helm Charts are released.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Jont828 fyi

Copy link
Contributor

Choose a reason for hiding this comment

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

@sbueringer So just to clarify, would that break using the visualizer app with Tilt, or would we still be good to use it as we are now?

Copy link
Member Author

Choose a reason for hiding this comment

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

This does not break the visualizer app.

The consequence is just that we always have to set a helm chart version in our kustomization.yamls. But we already do this everywhere for our own sanity, e.g.

cluster-api/hack/observability/visualizer/kustomization.yaml

Line 10 in e5db021

version: 1.1.0

Before this PR we could have left the version unset and tilt-prepare would have automatically pulled latest

Copy link
Contributor

Choose a reason for hiding this comment

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

CAPZ has deeper integration with Helm, and it's not possible to remove those imports.

@sbueringer do you have any ideas about how to work around this no export data for "oras.land/oras-go/pkg/auth/docker" problem caused by importing both Docker and Helm? I've been trying a variety of approaches but no luck so far, and it's preventing CAPZ from adopting CAPI v1.4.5 and v1.5.0.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main

vincepri
vincepri approved these changes Jul 21, 2023
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 Jul 21, 2023
chrischdi
chrischdi reviewed Jul 21, 2023
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9d14221b9d4b55dbfe984ff8426b8302bc624884

@k8s-ci-robot k8s-ci-robot merged commit 7493f5a into kubernetes-sigs:main Jul 21, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Jul 21, 2023
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: cannot checkout release-1.7: error checking out release-1.7: exit status 1. output: error: pathspec 'release-1.7' did not match any file(s) known to git

In response to this:

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

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: cannot checkout release-1.6: error checking out release-1.6: exit status 1. output: error: pathspec 'release-1.6' did not match any file(s) known to git

In response to this:

/cherry-pick release-1.6

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.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #9038 failed to apply on top of branch "release-1.5":

Applying: Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
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
Auto-merging 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 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
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:

/cherry-pick release-1.5

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.

@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: #9038 failed to apply on top of branch "release-1.4":

Applying: Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
Using index info to reconstruct a base tree...
M	hack/tools/go.mod
M	hack/tools/go.sum
M	hack/tools/tilt-prepare/main.go
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/tilt-prepare/main.go
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 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
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:

/cherry-pick release-1.4

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.

@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: #9038 failed to apply on top of branch "release-1.3":

Applying: Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
Using index info to reconstruct a base tree...
M	hack/tools/go.mod
M	hack/tools/go.sum
M	hack/tools/tilt-prepare/main.go
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/tilt-prepare/main.go
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 Bump to docker v24.0.5-0.20230714235725-36e9e796c6fc
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:

/cherry-pick release-1.3

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.

@killianmuldoon
Copy link
Contributor

I can do the cherry-picks for 1.5 and 1.4 - wondering if we should cherry-pick to 1.3 given we won't have another release until after next tuesday. That would leave the final release on a commit 🤔

@sbueringer
Copy link
Member Author

sbueringer commented Jul 21, 2023 •
edited
Loading

@killianmuldoon I think it's okay. Rather a commit that works vs what we currently have.

Would be great if you can open the cherry-picks

(it's still just a test/dev provider)

@sbueringer sbueringer deleted the pr-bump-docker branch July 21, 2023 15:36
This was referenced Jul 21, 2023
Merged
Merged
Merged
@CecileRobertMichon
Copy link
Contributor

belated lgtm

/lgtm

@killianmuldoon
Copy link
Contributor

/area dependency

@k8s-ci-robot k8s-ci-robot added the area/dependency Issues or PRs related to dependency changes label Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jont828 Jont828 Jont828 left review comments

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@chrischdi chrischdi chrischdi left review comments

@mboersma mboersma mboersma left review comments

@vincepri vincepri vincepri approved these changes

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@chrischdi chrischdi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

CAPD does not work when compiled with Go 1.20.6
9 participants
@sbueringer @k8s-infra-cherrypick-robot @killianmuldoon @k8s-ci-robot @CecileRobertMichon @mboersma @chrischdi @vincepri @Jont828