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

bump golang.org/grpc to v1.56.3 #121364

Merged
merged 1 commit into from Oct 20, 2023
Merged

Conversation

sxd
Copy link
Contributor

@sxd sxd commented Oct 19, 2023

Bumping golang.org/grpc in light of CVE-2023-44487.

What type of PR is this?

What this PR does / why we need it:

Fix the issues reported by CVE-2023-44487 fixed in release 1.58.3

Does this PR introduce a user-facing change?

NONE

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 19, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @sxd!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 19, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @sxd. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci-robot k8s-ci-robot added do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/dependency Issues or PRs related to dependency changes area/kubelet sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 19, 2023
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 19, 2023
@Jefftree
Copy link
Member

/triage accepted
/ok-to-test
/assign @liggitt

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Oct 19, 2023
@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 19, 2023
@Jefftree
Copy link
Member

Please run hack/update-vendor.sh

@sxd
Copy link
Contributor Author

sxd commented Oct 19, 2023

/retest-required

@@ -75,7 +75,6 @@
"status": {
"unwantedReferences": {
"cloud.google.com/go": [
"cloud.google.com/go/compute",
Copy link
Member

Choose a reason for hiding this comment

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

huh... I'm happy to see this drop out, but later / current versions of cloud.google.com/go/compute still depend on cloud.google.com/go, so I won't be surprised to see it come back.

The big win will be when cloud.google.com/go/compute/metadata stops depending on cloud.google.com/go/compute, and all the other things we have depending on cloud.google.com/go/compute below start dropping out. I think that will happen early next year along with the genproto cleanup.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Uff sad to hear that, the problem is that with that inside the test fails and this update is required to fix the security issue
@liggitt how do you think we can proceed with this?

Copy link
Member

Choose a reason for hiding this comment

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

oh, I wouldn't block on this, dropping this here and then adding it back later if we need to is fine

@dims said there's another CVE that needs an even newer grpc - #121338 was open for that ... should we take that one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I started with the even newer version 1.59.0 but that was a lot of more changes required including s2a-go package which it's also unwanted, if we can go with 1.59.0 and remove that unwanted one it's ok
The version 1.56.3 it's the one that requires less changes in the code and manage to fix the security issue with few changes

Copy link
Member

Choose a reason for hiding this comment

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

the s2a-go issue in particular was discussed in slack here:

John Howard
The new version of cloud.google.com/go/compute pulls in an "unwanted dependency" s2a-go. Any action we need to do here? Remove from unwanted? Complain to go/compute repo? Don't update go/compute? Running into this in #120241. Can work around it in that PR sort of, though.

Stephen Kitt
... or add it to the status for cloud.google.com/go/compute in unwanted-dependencies.json — the former is already an unwanted module, so adding a cloud dependency to an existing unwanted cloud dependency doesn’t change much in the grand scheme of things IMO

Stephen Kitt
What would be really unwanted would be adding s2a-go as a dependency for a non-unwanted module, or a direct k/k dependency.

liggitt
there were two reasons it was marked as unwanted:

the current state of that library means it doesn't pull in objectionable transitive dependencies any more
that said, we don't want more dependencies in general, so we look hard at any additions. in this case, it looks like the only referencer is cloud.google.com/go/compute, which we have a timeline of ~next March for dropping. +1 to Stephen Kitt’s comment about tracking the things that pull in s2a-go and limiting it to cloud deps we have a plan to drop, so this will drop out along with them

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't in that channel, ok so it make sense to restrict the s2a-go dependency to the already existed dependency that as I checked it was only the go/compute thing, probably @dims can target version 1.59.0 on his PR and we can drop this one that actually fix only the gprc because I thought #121338 was only about OTEL :D
Closing this one to let the other one proceed

@sxd sxd closed this Oct 19, 2023
@liggitt liggitt reopened this Oct 19, 2023
@liggitt
Copy link
Member

liggitt commented Oct 19, 2023

reopening, @dims had this feedback:

I have a feeling we should do 121364, cherry-picks to stable branches and then merge the otel one and keep it just forward looking (no backports)

(since the otel code we use is not actually impacted by the CVE being fixed)

@sxd
Copy link
Contributor Author

sxd commented Oct 19, 2023

oh! well that will make sense since this will not have a big impact and I'm guessing it can be backported easily
How we should proceed?

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Oct 19, 2023
@liggitt
Copy link
Member

liggitt commented Oct 19, 2023

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

LGTM label has been added.

Git tree hash: 913ba5d646ba6725dce0a85ccadf255e40edc160

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Oct 19, 2023
@sxd
Copy link
Contributor Author

sxd commented Oct 19, 2023

/retest

@liggitt
Copy link
Member

liggitt commented Oct 20, 2023

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 20, 2023
@k8s-ci-robot k8s-ci-robot merged commit 239537e into kubernetes:master Oct 20, 2023
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.29 milestone Oct 20, 2023
@orsenthil
Copy link
Contributor

This PR bumps the google.golang.org/grpc v1.56.3 forCVE-2023-44487 but the fix is advertised as fixed in release 1.58.3

Shouldn't this be updating to google.golang.org/grpc v1.58.3 ?

@dims
Copy link
Member

dims commented Oct 25, 2023

@jerryhe1999
Copy link

jerryhe1999 commented Oct 25, 2023

Do we have any plan merging this PR to other release versions v1.26-v1.28 rather than master/v1.29 release?

@dims
Copy link
Member

dims commented Oct 26, 2023

1.26/1.27/1.28 are here, 1.25 is out of support starting tomorrow, so won't file one for that:
https://github.com/kubernetes/kubernetes/pulls?q=is%3Apr+is%3Aopen+%22bump+golang.org%2Fgrpc+to+v1.56.3%22

k8s-ci-robot added a commit that referenced this pull request Nov 1, 2023
…-upstream-release-1.28

Automated cherry pick of #121364: bump golang.org/grpc to v1.56.3
k8s-ci-robot added a commit that referenced this pull request Nov 1, 2023
…-upstream-release-1.27

Automated cherry pick of #121364: bump golang.org/grpc to v1.56.3
k8s-ci-robot added a commit that referenced this pull request Nov 1, 2023
…-upstream-release-1.26

Automated cherry pick of #121364: bump golang.org/grpc to v1.56.3
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. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kube-proxy area/kubectl area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

7 participants