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

Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to #113459

Conversation

aimuz
Copy link
Contributor

@aimuz aimuz commented Oct 31, 2022

Cherry pick of #112693 on release-1.24.

#112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to

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

Updates golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80 to resolve CVE-2022-27664

@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Oct 31, 2022
@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/apiserver area/cloudprovider 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. area/code-generation labels Oct 31, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @aimuz. 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 area/dependency Issues or PRs related to dependency changes needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/kubectl labels Oct 31, 2022
@k8s-ci-robot k8s-ci-robot added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Oct 31, 2022
@k8s-ci-robot k8s-ci-robot requested review from andrewsykim and a team October 31, 2022 02:06
@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. 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/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-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 31, 2022
@aimuz
Copy link
Contributor Author

aimuz commented Oct 31, 2022

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 31, 2022
@enj enj added this to Needs Triage in SIG Auth Old Nov 14, 2022
@liggitt
Copy link
Member

liggitt commented Nov 15, 2022

oh, that's irritating... the golang.org/x/sys update requires modifying go.mod to go1.18

vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
vendor/golang.org/x/sys/unix/syscall_linux.go:2255:9: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
vendor/golang.org/x/sys/unix/syscall_unix.go:118:7: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
vendor/golang.org/x/sys/unix/sysvshm_unix.go:33:7: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)

that's why the analysis is failing... builds and unit tests also fail

I guess I'll pick #109440 to release-1.24 separately, then this should work

@dims
Copy link
Member

dims commented Nov 15, 2022

I guess I'll pick #109440 to release-1.24 separately, then this should work

Sounds good @liggitt

@liggitt
Copy link
Member

liggitt commented Nov 15, 2022

sorry for the conflicts, but if you replay the version bump on latest release-1.24, the verification errors should be resolved now

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2022
@aimuz
Copy link
Contributor Author

aimuz commented Nov 16, 2022

Yes, he had to change to 1.18, can the 1.23 branch be changed?

@liggitt
Copy link
Member

liggitt commented Nov 16, 2022

Not yet, 1.24 was already building with go1.18. Getting 1.23 onto go1.18 is more involved (see #113416)

@aimuz aimuz force-pushed the automated-cherry-pick-of-#112693-upstream-release-1.24 branch from 62bc382 to 4e2d7a0 Compare November 16, 2022 01:55
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 16, 2022
@aimuz
Copy link
Contributor Author

aimuz commented Nov 16, 2022

/retest

@k8s-ci-robot
Copy link
Contributor

@aimuz: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-capz-windows-containerd-1-24 4e2d7a0 link false /test pull-kubernetes-e2e-capz-windows-containerd-1-24

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@aimuz
Copy link
Contributor Author

aimuz commented Nov 16, 2022

pull-kubernetes-e2e-capz-windows-containerd-1-24 testing behavior is curiously dependent on go 1.19

https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/113459/pull-kubernetes-e2e-capz-windows-containerd-1-24/1592715586062782464#1:build-log.txt%3A64

@liggitt
Copy link
Member

liggitt commented Nov 16, 2022

that job's config was just modified in kubernetes/test-infra#27971 (comment), asked about it there

@liggitt
Copy link
Member

liggitt commented Nov 16, 2022

/skip
/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 Nov 16, 2022
@liggitt
Copy link
Member

liggitt commented Nov 16, 2022

cc @kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 16, 2022
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

SIG Auth Old automation moved this from Needs Triage to In Progress Nov 16, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aimuz, cpanato, 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

@cpanato cpanato added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 16, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 16, 2022
@k8s-ci-robot k8s-ci-robot merged commit d818028 into kubernetes:release-1.24 Nov 16, 2022
SIG Node PR Triage automation moved this from Triage to Done Nov 16, 2022
SIG Auth Old automation moved this from In Progress to Closed / Done Nov 16, 2022
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/kubectl area/release-eng Issues or PRs related to the Release Engineering subproject 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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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/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/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
SIG Auth Old
Closed / Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants