Skip to content

[1.19] Cherry pick of #98477: update gogo/protobuf to v1.3.2#100515

Merged
k8s-ci-robot merged 1 commit intokubernetes:release-1.19from
joelsmith:release-1.19
Mar 29, 2021
Merged

[1.19] Cherry pick of #98477: update gogo/protobuf to v1.3.2#100515
k8s-ci-robot merged 1 commit intokubernetes:release-1.19from
joelsmith:release-1.19

Conversation

@joelsmith
Copy link
Copy Markdown
Contributor

@joelsmith joelsmith commented Mar 24, 2021 •
edited
Loading

Cherry pick of #98477 on release-1.19.

#98477: update gogo/protobuf to v1.3.2

For details on the cherry pick process, see the cherry pick requests page.

Regenerate protobuf code to fix CVE-2021-3121

@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 24, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/kubelet kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 24, 2021
@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. labels Mar 24, 2021
@joelsmith
Copy link
Copy Markdown
Contributor Author

joelsmith commented Mar 24, 2021

/retest

1 similar comment
@joelsmith
Copy link
Copy Markdown
Contributor Author

joelsmith commented Mar 25, 2021

/retest

@sttts
Copy link
Copy Markdown
Contributor

sttts commented Mar 25, 2021

automated cherry-pick with generated code are suspicious. Have you checked that updating the proto files afterwards is a noop?

@sttts
Copy link
Copy Markdown
Contributor

sttts commented Mar 25, 2021

/lgtm
/approve

for dep changes.

/assign @liggitt

for api changes.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 25, 2021
@joelsmith
Copy link
Copy Markdown
Contributor Author

joelsmith commented Mar 25, 2021

automated cherry-pick with generated code are suspicious. Have you checked that updating the proto files afterwards is a noop?

Although this PR started as an automated cherry pick, I had to re-run several of the generation steps until all of the code-generation verification checks were happy.

hack/pin-dependency.sh github.com/gogo/protobuf v1.3.2
hack/update-vendor.sh
hack/lint-dependencies.sh
# and repeat for any identified additional deps

hack/update-generated-kubelet-plugin-registration.sh
hack/update-generated-pod-resources.sh
hack/update-generated-protobuf.sh

@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 Mar 25, 2021
@liggitt
Copy link
Copy Markdown
Member

liggitt commented Mar 26, 2021

/approve

@derekwaynecarr
Copy link
Copy Markdown
Member

derekwaynecarr commented Mar 26, 2021

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2021
@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Mar 29, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 29, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, joelsmith, liggitt, saschagrunert, sttts

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@saschagrunert
Copy link
Copy Markdown
Member

saschagrunert commented Mar 29, 2021

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@k8s-ci-robot k8s-ci-robot merged commit 0817555 into kubernetes:release-1.19 Mar 29, 2021
@fedebongio
Copy link
Copy Markdown
Contributor

fedebongio commented Mar 30, 2021

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 30, 2021
@github-actions github-actions Bot mentioned this pull request Apr 6, 2021
Open
@joelsmith joelsmith mentioned this pull request Apr 23, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@aleksandra-malinowska aleksandra-malinowska Awaiting requested review from aleksandra-malinowska

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

Assignees

@sttts sttts

@liggitt liggitt

@derekwaynecarr derekwaynecarr

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/kubectl area/kubelet cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

SIG Node: code and documentation PRs
Archived in project

Milestone

v1.19

Development

Successfully merging this pull request may close these issues.

8 participants

@joelsmith @sttts @liggitt @derekwaynecarr @k8s-ci-robot @saschagrunert @fedebongio @ehashman