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 genproto #508

Merged
merged 2 commits into from
Aug 25, 2023
Merged

update genproto #508

merged 2 commits into from
Aug 25, 2023

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Aug 2, 2023

This updates the genproto library to a version matching kubernetes 1.28, which carves out the rpc subpackage (see googleapis/go-genproto#1015 for details)

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 2, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 2, 2023

// Prefer to keep requirements compatible with the oldest supported
// k/k minor version, to prevent client backport issues.
require (
github.com/prometheus/client_golang v1.11.1
go.uber.org/goleak v1.2.0
golang.org/x/net v0.7.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm fine with the top level go.mod changes.
Our docs currently indicate that the main line is meant for K/K 1.27+. However 1.27 go.mod show this would force an upgrade of libraries on the KAS.

Sounds like we should probably create a 0.2 (?0.28) branch to correspond the the 1.28 K/K release.

Might be worth breaking this into two PRs, so we can get the ANP binaries fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's not urgent, we can wait for the 1.28 release, create a branch, and update both together

Copy link
Contributor

Choose a reason for hiding this comment

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

#510 is resolved, and per last biweekly OSS meeting we can proceed to create a "new scheme" branch release-0.28 and cut a 0.28.x tag (in this repo).

But, k/k at release-1.28 still has older versions than what I see here, is it expected?

https://github.com/kubernetes/kubernetes/blob/release-1.28/go.mod#L91-L92

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/kubernetes/kubernetes/pull/118269/files has the minimum genproto versions we'd want to update to here... I can pick those instead of latest (which is what pulled in the newer grpc)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pushed an update to match versions used in k8s 1.28

does the resolution of #510 mean we would:

  1. create release-0.27 from master before this PR (to give a target for updates destined for k8s 1.27)
  2. create release-0.28 from master before this PR (to give a target for updates destined for k8s 1.28)
  3. merge this PR master and cherry-pick it to release-0.28

Copy link
Contributor

Choose a reason for hiding this comment

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

Essentially number 1, except we'll start the new mapping scheme in 1.28.

I sent #517 to propose new branch names in the short term.

@jkh52
Copy link
Contributor

jkh52 commented Aug 9, 2023

#510 tracks separate branching proposal.

@liggitt liggitt changed the title WIP - update genproto update genproto Aug 25, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 25, 2023
@jkh52
Copy link
Contributor

jkh52 commented Aug 25, 2023

/lgtm
/approve

I created release-0.1 branch at HEAD (for 1.27 and previous), so we can begin using master branch for 1.28.

Feel free to unhold when you're ready.

/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 Aug 25, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jkh52, liggitt

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 lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 25, 2023
@liggitt
Copy link
Contributor Author

liggitt commented Aug 25, 2023

/hold cancel

@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 Aug 25, 2023
@k8s-ci-robot k8s-ci-robot merged commit 13cdb4c into kubernetes-sigs:master Aug 25, 2023
6 checks passed
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants