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 go.mod for k8s 1.17 #8873

Merged
merged 3 commits into from
Apr 8, 2020

Conversation

justinsb
Copy link
Member

@justinsb justinsb commented Apr 8, 2020

These are now tagged with v0.17.4, so we don't need the trick of the
commented out imports any more!

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 8, 2020
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2020
@justinsb
Copy link
Member Author

justinsb commented Apr 8, 2020

BTW here's a video of how to update these, except that I don't think we need to any more because it looks like upstream has (mostly?) fixed their go.mods, so now we can just use v0.17.4 instead of kubernetes-1.17.4, and that value isn't mangled by go.mod: https://asciinema.org/a/317782

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 8, 2020
@justinsb
Copy link
Member Author

justinsb commented Apr 8, 2020

cc @rifelpet on the video. The other steps are to run make gomod to update vendor/, and then fix up any problems - here the problem was only a new flag that GCE cloudprovider added, that otherwise would make it into all our docs, so pretty easy this time (at least so far!)

@mikesplain
Copy link
Contributor

Thanks @justinsb!

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, mikesplain

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 [justinsb,mikesplain]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

go.mod Outdated
k8s.io/cli-runtime v0.0.0
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/cli-runtime v0.17.4
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
Copy link
Member

Choose a reason for hiding this comment

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

thanks, the video was very helpful! can you explain why this version didn't (need to) change? It seems all of the k8s.io packages are covered by replaces above, but this, kubectl, and legacy-cloud-providers below didn't change.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmmm ... that's a good point and is just my mistake! Will hold the PR!

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah actually, I take it back...

The replace directives at the top take precedence, and we do have:

replace k8s.io/client-go => k8s.io/client-go v0.17.4

client-go started adopted a different versioning scheme though, and it looks like it isn't fully sorted out yet. That confuses go.mod which then puts some random version in the directives.

I was able to override the version in go.mod manually, so it now looks intuitive, even though that version wasn't used before.

We'll likely have to do this manually going forwards (but if we forget, it shouldn't really matter)

Copy link
Member

Choose a reason for hiding this comment

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

ah ok. and does the same apply for kubectl and legacy-cloud-providers ?

@justinsb
Copy link
Member Author

justinsb commented Apr 8, 2020

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2020
These are now tagged with v0.17.4, so we don't need the trick of the
commented out imports any more!
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2020
@justinsb
Copy link
Member Author

justinsb commented Apr 8, 2020

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2020
@rifelpet
Copy link
Member

rifelpet commented Apr 8, 2020

seems like the answer to my last question is yes.

/lgtm

I propose we let this sit for a bit to let periodic e2e jobs run, then cherry-pick back to 1.17

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2020
@k8s-ci-robot k8s-ci-robot merged commit 47b9b23 into kubernetes:master Apr 8, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Apr 8, 2020
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants