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

master: update release-tools #188

Merged
merged 19 commits into from Nov 14, 2019
Merged

Conversation

@pohly
Copy link
Contributor

pohly commented Nov 4, 2019

Commit summary:
8067845 travis.yml: also use vendor directory
23df4ae prow.sh: use vendor directory if available
c8a1c4a better handling of Go version
5e773d2 update CI to use Go 1.13.3
e0fde8c Add new variables for 1.16 and remove 1.13
f1697d2 Do full git clones in travis. Shallow clones are causing test-subtree errors when the depth is exactly 50.
2d6b3ce Build Windows only for amd64
c1078a6 go-get-kubernetes.sh: automate Kubernetes dependency handling
194289a update Go mod support
6208f6a Enable hostpath expansion

NONE
gnufied and others added 18 commits Sep 16, 2019
Enable hostpath expansion
It turned out that changes like
kubernetes-csi/csi-lib-utils#33 should better
have been committed after `go mod tidy` because that adds some
indirect dependencies in that example.

The revised `test-vendor` checks for that and (just in case that this
ever becomes desired) allows projects to not have a vendor directory
when using `go mod`.

How to use `go mod` properly gets documented in the README.md, because
there are such pitfalls.
This script handles the necessary "replace" statements and determines
which packages need to be updated in lockstep.
Signed-off-by: Deep Debroy <ddebroy@docker.com>
Build Windows only for amd64
update Go mod support
errors when the depth is exactly 50.
Do full git clones in travis
Add new variables for 1.16 and remove 1.13
This is the latest release. Updating is useful to ensure that we have
all of the latest fixes and enhancements.
Some operations are sensitive to the version of Go that is used. In
the past, formatting of source differed depending on the
version. Right now it is the content of the vendor directory which
changes when switch back and forth between 1.12 and 1.13.

We don't want to impose a certain workflow on developers, like forcing
all invocations of Go to run inside a container. If developers want
that, they can set up their development environment accordingly.

But we should warn about this aspect to raise awareness. "make"
invocations which involve Go now compare against the projects Go
version (specified in travis.yml) once at the beginning. This is only
a warning because we don't know which future version will be
compatible with the project.

Vendor directory handling gets updated, too: verification is now a
separate script (became too complex for make) and there is a
corresponding "update-vendor.sh". In contrast to verification,
updating vendor is not integrated into make and thus itself invokes
the go version check.
Go version 1.13, helper scripts
This avoids dependencies on the Go module cache or the upstream code
hosting.
prow.sh: use vendor directory if available
@msau42

This comment has been minimized.

Copy link
Collaborator

msau42 commented Nov 5, 2019

/assign @xing-yang

@xing-yang

This comment has been minimized.

Copy link
Collaborator

xing-yang commented Nov 5, 2019

Let's get the split controller PR merged first.
/hold

@xing-yang

This comment has been minimized.

Copy link
Collaborator

xing-yang commented Nov 9, 2019

The split controller PR is merged. Can you rebase this PR?

@xing-yang

This comment has been minimized.

Copy link
Collaborator

xing-yang commented Nov 9, 2019

/hold cancel

Manually resolved a merge conflict for vendor/modules.txt. This cannot
be done via a rebase because that would destroy the git submodule
history of `csi-release-tools`.
@pohly

This comment has been minimized.

Copy link
Contributor Author

pohly commented Nov 11, 2019

Updated. Rebasing isn't possible when csi-release-tools is involved, so I added a merge commit where I resolved the conflict.

@@ -200,9 +206,10 @@ configvar CSI_PROW_HOSTPATH_CANARY "" "hostpath image"
# all generated files are present.
#
# CSI_PROW_E2E_REPO=none disables E2E testing.
configvar CSI_PROW_E2E_VERSION_1_13 v1.14.0 "E2E version for Kubernetes 1.13.x" # we can't use the one from 1.13.x because it didn't have --storage.testdriver
# TOOO: remove versioned variables and make e2e version match k8s version

This comment has been minimized.

Copy link
@xing-yang

xing-yang Nov 14, 2019

Collaborator

s/TOOO/TODO?

This comment has been minimized.

Copy link
@pohly

pohly Nov 14, 2019

Author Contributor

True, but that can't be fixed here. It went into csi-release-tools in kubernetes-csi/csi-release-tools@e0fde8c and would have to be fixed there.

Not worth it, right? 😬

@xing-yang

This comment has been minimized.

Copy link
Collaborator

xing-yang commented Nov 14, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Nov 14, 2019
@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 14, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pohly, xing-yang

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 d9579ad into kubernetes-csi:master Nov 14, 2019
6 of 7 checks passed
6 of 7 checks passed
tide Not mergeable. Retesting: pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-1-14 pull-kubernetes-csi-external-snapshotter-unit
Details
cla/linuxfoundation pohly authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-1-14 Job succeeded.
Details
pull-kubernetes-csi-external-snapshotter-1-15-on-kubernetes-1-15 Job succeeded.
Details
pull-kubernetes-csi-external-snapshotter-1-16-on-kubernetes-1-16 Job succeeded.
Details
pull-kubernetes-csi-external-snapshotter-unit Job succeeded.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.