Skip to content

Update golang/x/net dependency on release-1.13 #81546

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
Merged
k8s-ci-robot merged 2 commits into from
Aug 17, 2019
Merged

Update golang/x/net dependency on release-1.13 #81546

k8s-ci-robot merged 2 commits into from
Aug 17, 2019

Conversation

@cblecker
Copy link
Member

@cblecker cblecker commented Aug 17, 2019

What type of PR is this?
/kind bug
/priority critical-urgent
/sig release network

What this PR does / why we need it:
Updates golang.org/x/net dependency to bring in http2 fix

Which issue(s) this PR fixes:
ref golang/go#33606
ref #79912

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Update golang/x/net dependency to bring in fixes for CVE-2019-9512, CVE-2019-9514

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

dims and others added 2 commits August 16, 2019 23:51
@dims @cblecker
Hack to ignore stale packages in godep
708702b 
Change-Id: Ibf0877521310d6f2baad605bf1216940e95cb9cd
@cblecker
Update golang.org/x/net to b1cc14a
e795732
@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Aug 17, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.13 milestone Aug 17, 2019
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/network Categorizes an issue or PR as relevant to SIG Network. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 17, 2019
@k8s-ci-robot k8s-ci-robot added area/apiserver 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/architecture Categorizes an issue or PR as relevant to SIG Architecture. 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. labels Aug 17, 2019
@cblecker cblecker mentioned this pull request Aug 17, 2019
Closed
@BenTheElder
Copy link
Member

BenTheElder commented Aug 17, 2019

/cc
/retest

BenTheElder
BenTheElder approved these changes Aug 17, 2019
View reviewed changes
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
two non-blocking nits / suggestions

hack/godep-save.sh
## was moved to the "golang.org/x/net/http/httpguts" directory, we do not use
## this directly, however many packages we vendor are still using the older
## golang.org/x/net and we need to keep this until all those dependencies
## are switched to newer golang.org/x/net.
Copy link
Member

@BenTheElder BenTheElder Aug 17, 2019

Choose a reason for hiding this comment

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

yikes

hack/godep-save.sh
# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.
REQUIRED_BINS=(
REQUIRED_BINS+=(
Copy link
Member

@BenTheElder BenTheElder Aug 17, 2019

Choose a reason for hiding this comment

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

tiny suggestion: invert this logic so the workaround follows and appends, so we change less in the future to undo it? /shrug

third_party/forked/godep/pkg.go
return nil, nil
}

pkgs := strings.Split(ignorePackages, ",")
Copy link
Member

@BenTheElder BenTheElder Aug 17, 2019

Choose a reason for hiding this comment

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

nit / suggestion: can we call this variable something that makes it clear we want to ignore these?
LoadPackages containing a pkgs that is not what we're loading is slightly confusing imho.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 17, 2019
@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 17, 2019
@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 Aug 17, 2019
@tpepper
Copy link

tpepper commented Aug 17, 2019

/assign @thockin @smarterclayton @lavalamp

@cblecker
Copy link
Member Author

cblecker commented Aug 17, 2019

@BenTheElder 708702b is a cherry pick of eb4865f which has already been merged into master. I'd rather not make additional changes to it.

@cblecker
Copy link
Member Author

cblecker commented Aug 17, 2019

All approvals are in, except for third_party/. As the code that will merge there is already a part of master, and we need this merged in order to cut a release, I'm going to use maintainer powers to manually stamp this as approved.

@cblecker cblecker added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 17, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Aug 17, 2019

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: BenTheElder, cblecker

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

@k8s-ci-robot k8s-ci-robot merged commit 37d1693 into kubernetes:release-1.13 Aug 17, 2019
@cblecker cblecker deleted the 1.13/go-1.11.13 branch August 17, 2019 21:22
@knisbet knisbet mentioned this pull request Aug 30, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BenTheElder BenTheElder BenTheElder approved these changes

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@davidopp davidopp Awaiting requested review from davidopp

Assignees

@lavalamp lavalamp

@BenTheElder BenTheElder

@smarterclayton smarterclayton

@thockin thockin

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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/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/network Categorizes an issue or PR as relevant to SIG Network. sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

v1.13

Development

Successfully merging this pull request may close these issues.

8 participants

@cblecker @BenTheElder @tpepper @k8s-ci-robot @lavalamp @smarterclayton @thockin @dims