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

[v1.16.5] Update to go1.13.4 #85019

Merged
merged 14 commits into from Dec 19, 2019
Merged

Conversation

@liggitt
Copy link
Member

liggitt commented Nov 8, 2019

Picks:

1.16-specific:

  • Move e2e flag copy into TestMain (same thing as e2e_node, done for e2e)

Before merge:

/cc @tpepper
/sig release

Kubernetes 1.16.5+ now requires go1.13.4+ to build 
liggitt added 8 commits Dec 9, 2019
As of go1.13, test flags like test.timeout are registered lazily.
This means they are not available in package init() methods:

> Testing flags are now registered in the new Init function,
> which is invoked by the generated main function for the test.
> As a result, testing flags are now only registered when running
> a test binary, and packages that call flag.Parse during package
> initialization may cause tests to fail.

This moves the copy of CLI flags into TestMain, just prior to parse.
To fix bug exposed by reflect.Value#IsZero method added in go1.13
hack/pin-dependency.sh k8s.io/repo-infra v0.0.1-alpha.1
To fix non-idempotent BUILD file generation

hack/pin-dependency.sh github.com/bazelbuild/bazel-gazelle v0.19.0
hack/pin-dependench.sh github.com/bazelbuild/buildtools 0.29.0
for go1.13.3 support

hack/lint-dependencies.sh

hack/pin-dependency.sh github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89
to pick up preferred version for repo-infra
go1.13-levels
hack/pin-dependency.sh golang.org/x/crypto release-branch.go1.13
hack/pin-dependency.sh golang.org/x/net release-branch.go1.13
hack/pin-dependency.sh golang.org/x/tools release-branch.go1.13
hack/pin-dependency.sh golang.org/x/sys release-branch.go1.13

preferred levels for repos without 1.13 branches:
hack/pin-dependency.sh golang.org/x/lint v0.0.0-20190409202823-959b441ac422
hack/pin-dependency.sh golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
hack/pin-dependency.sh golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
hack/pin-dependency.sh golang.org/x/text v0.3.2
hack/pin-dependency.sh golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
hack/pin-dependency.sh github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d
hack/pin-dependency.sh github.com/go-openapi/swag v0.19.5
hack/pin-dependency.sh github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
hack/pin-dependency.sh github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e
hack/pin-dependency.sh github.com/mattn/go-isatty v0.0.9
hack/pin-dependency.sh github.com/pkg/errors v0.8.1
hack/pin-dependency.sh github.com/spf13/pflag v1.0.5
hack/pin-dependency.sh gopkg.in/inf.v0 v0.9.1
hack/pin-dependency.sh k8s.io/klog v1.0.0

GO111MODULE=on go mod edit -dropreplace github.com/heketi/rest
GO111MODULE=on go mod edit -dropreplace github.com/heketi/utils
@liggitt liggitt force-pushed the liggitt:go-1.13-1.16 branch from 9e8d015 to 26eb08c Dec 18, 2019
@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

kubernetes/test-infra#15637 merged, rebased and retesting

@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

oh, we need to bump the kubekins image to pick up the go version change for 1.16 (e.g. kubernetes/test-infra#15133). xref kubernetes/test-infra#15637 (comment)

looks like kubernetes/test-infra#15627 will do that

@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

/retest

@liggitt liggitt force-pushed the liggitt:go-1.13-1.16 branch from 26eb08c to c57aa41 Dec 18, 2019
@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

fixed the stray bazel file... all other CI jobs passed on the first try after bumping test-infra to go1.13 🎉

@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

@tpepper this is green

Copy link
Member

cblecker left a comment

Can you please specify that this is for 1.16.z in your release note?

Thank you for splitting up the commits.. makes it much easier to review in chunks.

/lgtm
/approve
/hold

@liggitt

This comment has been minimized.

Copy link
Member Author

liggitt commented Dec 18, 2019

Done

@cblecker

This comment has been minimized.

Copy link
Member

cblecker commented Dec 18, 2019

/hold cancel
:shipit:

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 18, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

@k8s-ci-robot k8s-ci-robot merged commit 74eb9f2 into kubernetes:release-1.16 Dec 19, 2019
12 of 13 checks passed
12 of 13 checks passed
tide Not mergeable. Should not have do-not-merge/cherry-pick-not-approved label.
Details
cla/linuxfoundation liggitt authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Job succeeded.
Details
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
@liggitt liggitt deleted the liggitt:go-1.13-1.16 branch Dec 19, 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.