Skip to content

Update kubernetes dependencies to 1.21.1 #383

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

Merged
merged 1 commit into from
Jun 21, 2021
Merged

Update kubernetes dependencies to 1.21.1 #383

merged 1 commit into from
Jun 21, 2021

Conversation

adamwg
Copy link
Contributor

@adamwg adamwg commented Jun 17, 2021

As part of this change, use the resizefs implementation from k8s.io/mount-utils. This gets rid of the last reference to k8s.io/kubernetes, so we no longer need to vendor it 🎉.

While we're here, tidy up the go.mod file a bit by putting all the replaces in one stanza. I suspect we ended up with some separated out at the end via previous runs of update-k8s.sh, but I don't see any good reason to keep it that way.

go.mod Outdated
k8s.io/metrics => k8s.io/metrics v0.20.2
k8s.io/api => k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery => k8s.io/apimachinery v0.21.2-rc.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason to use an rc release here? v0.21.2 would also be available. Also applies to the other rcs in this file.

Copy link
Contributor

Choose a reason for hiding this comment

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

Probably the same reason as in #318 (comment).

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like it. v0.21.1 and v0.21.2-rc.0 both point to 7559d78

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Aha, I wondered about this as well but trusted that the tool was calculating things correctly. Updated to v0.21.1 everywhere for consistency.

As part of this change, use the resizefs implementation from
`k8s.io/mount-utils`. This gets rid of the last reference to
`k8s.io/kubernetes`, so we no longer need to vendor it 🎉.

While we're here, tidy up the go.mod file a bit by putting all the `replace`s in
one stanza. I suspect we ended up with some separated out at the end via
previous runs of update-k8s.sh, but I don't see any good reason to keep it that
way.
@adamwg adamwg merged commit db266f4 into master Jun 21, 2021
@adamwg adamwg deleted the awg/1.21 branch June 21, 2021 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants