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

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

Merged
merged 2 commits into from Aug 17, 2019

Conversation

@cblecker
Copy link
Member

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 Feb 25, 2019
Hack to ignore stale packages in godep
Change-Id: Ibf0877521310d6f2baad605bf1216940e95cb9cd
@BenTheElder

This comment has been minimized.

Copy link
Member

commented Aug 17, 2019

/cc
/retest

@k8s-ci-robot k8s-ci-robot requested a review from BenTheElder Aug 17, 2019

@BenTheElder
Copy link
Member

left a comment

/lgtm
/approve
two non-blocking nits / suggestions

## 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.

This comment has been minimized.

Copy link
@BenTheElder

BenTheElder Aug 17, 2019

Member

yikes

# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.
REQUIRED_BINS=(
REQUIRED_BINS+=(

This comment has been minimized.

Copy link
@BenTheElder

BenTheElder Aug 17, 2019

Member

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

@@ -42,9 +45,19 @@ func LoadPackages(names ...string) (a []*Package, err error) {
if len(names) == 0 {
return nil, nil
}

pkgs := strings.Split(ignorePackages, ",")

This comment has been minimized.

Copy link
@BenTheElder

BenTheElder Aug 17, 2019

Member

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.

@tpepper

This comment has been minimized.

Copy link
Contributor

commented Aug 17, 2019

@cblecker

This comment has been minimized.

Copy link
Member Author

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

This comment has been minimized.

Copy link
Member Author

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 label Aug 17, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

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

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

23 checks passed

cla/linuxfoundation cblecker authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Skipped.
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Skipped.
pull-kubernetes-e2e-gce-csi-serial Skipped.
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-iscsi Skipped.
pull-kubernetes-e2e-gce-iscsi-serial Skipped.
pull-kubernetes-e2e-gce-storage-slow Skipped.
pull-kubernetes-godeps Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Skipped.
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details

@cblecker cblecker deleted the cblecker:1.13/go-1.11.13 branch Aug 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.