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.

Sign up for GitHub

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

Jump to bottom

[1.20] Automated cherry pick of #98477: update gogo/protobuf to v1.3.2 #100501

Merged
merged 1 commit into from
Mar 29, 2021
Merged

[1.20] Automated cherry pick of #98477: update gogo/protobuf to v1.3.2 #100501

merged 1 commit into from
Mar 29, 2021

Conversation

joelsmith
Copy link
Contributor

@joelsmith joelsmith commented Mar 23, 2021 •
edited
Loading

Cherry pick of #98477 on release-1.20.

#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.20 milestone Mar 23, 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/XXL Denotes a PR that changes 1000+ 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. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 23, 2021
@k8s-ci-robot k8s-ci-robot requested review from andrewsykim, apelisse and a team March 23, 2021 19:03
@k8s-ci-robot k8s-ci-robot added 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. 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. 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 23, 2021
@joelsmith
Copy link
Contributor Author

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
liggitt reviewed Mar 26, 2021
View reviewed changes
go.mod Outdated Show resolved Hide resolved
pkg/apis/apps/v1/zz_generated.defaults.go Outdated Show resolved Hide resolved
@joelsmith joelsmith force-pushed the automated-cherry-pick-of-#98477-upstream-release-1.20 branch from 55614c4 to a02a4dd Compare March 26, 2021 05:07
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 26, 2021
@joelsmith
Copy link
Contributor Author

@liggitt thanks for catching the extra chages. I think that happened when I tried to use the automatic cherry-pick process with manual conflict resolution, then did auto-generation from there. I probably made mistakes along the way. I started over from release-1.20, and that got rid of the extra changes.

liggitt
liggitt reviewed Mar 26, 2021
View reviewed changes
pkg/kubelet/patch Outdated Show resolved Hide resolved
@joelsmith joelsmith force-pushed the automated-cherry-pick-of-#98477-upstream-release-1.20 branch from a02a4dd to c4ddcc9 Compare March 26, 2021 05:20
@joelsmith
Copy link
Contributor Author

/retest

1 similar comment
@joelsmith
Copy link
Contributor Author

/retest

@joelsmith joelsmith mentioned this pull request Mar 26, 2021
Closed
@joelsmith
Copy link
Contributor Author

/retest

@derekwaynecarr
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 26, 2021
@liggitt
Copy link
Member

liggitt commented Mar 26, 2021

/approve

@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
@ehashman ehashman added this to Done in SIG Node PR Triage Mar 27, 2021
@liggitt
Copy link
Member

liggitt commented Mar 29, 2021

/lgtm
/approve

@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
Contributor

[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

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

@joelsmith
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 67f7cc9 into kubernetes:release-1.20 Mar 29, 2021
@joelsmith joelsmith deleted the automated-cherry-pick-of-#98477-upstream-release-1.20 branch March 29, 2021 18:18
@thaJeztah thaJeztah mentioned this pull request Apr 13, 2021
Closed
@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

@liggitt liggitt liggitt left review comments

@saschagrunert saschagrunert saschagrunert approved these changes

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@apelisse apelisse Awaiting requested review from apelisse

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 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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/apps Categorizes an issue or PR as relevant to SIG Apps. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@joelsmith @fedebongio @sttts @derekwaynecarr @liggitt @k8s-ci-robot @saschagrunert