Fix make vendor #4208
Fix make vendor #4208
Conversation
Codecov Report
@@ Coverage Diff @@
## master #4208 +/- ##
=======================================
Coverage 39.06% 39.06%
=======================================
Files 111 111
Lines 8731 8731
=======================================
Hits 3411 3411
Misses 4944 4944
Partials 376 376 |
|
@saschagrunert ptal |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kolyshkin, mrunalp, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
|
wow good find, unfortunately, you've got a merge conflict |
|
LGTM |
9f8c5ea to
d670693
Compare
|
rebased |
|
/lgtm |
d670693 to
fbba293
Compare
|
Added more changes (removed |
|
CI error in integration_rhel is unrelated. It comes from Line 1623 in 876dd0d which is trying to remove pod (should probably not be the part of the test). The error is:
The pod is then removed successfully from |
|
/retest |
|
integration-rhel failed again, also while removing a pod, same problem, different test case (same file though), different namespace though.
Might be related to commit ab82e12 as it speeds things up (by removing unnecessary code) and now namespace removal happens a bit earlier. Not sure though why I'm the only one seeing this (and it's def unrelated to what is done in this PR) |
|
/retest |
|
/retest |
|
/lgtm |
FYI this is addressed by #4217 |
Commit 25eb7d8 added this target. Alas, the `go mod tidy` never worked, as it was written as part of `export` statement: export GO111MODULE=on \ $(GO) mod tidy && \ ... which is the same as export GO111MODULE=on $(GO) mod tidy && ... which exports a bunch of variables, such as `go`, `mod`, and `tidy` (or would export them if they existed), but does not run `go mod tidy`. The fix would be to add a semicolon after the `export` statement, but it looks like GO111MODULE=on is not needed, so just remove it. While at it, && are no longer needed either, so remove them as well. For GOSUMDB, export it for the target via Makefile Signed-off-by: Kir Kolyshkin <[email protected]>
While at it, fix punctuation and improve some formatting. Signed-off-by: Kir Kolyshkin <[email protected]>
GO111MODULE=on is not required for quite some time. go -mod=vendor is the default even when GOPATH is set since go 1.14. Signed-off-by: Kir Kolyshkin <[email protected]>
I suspect it was required to use vendor subdir. It is no longer required as of go 1.13 or so. Signed-off-by: Kir Kolyshkin <[email protected]>
The previous commit fixes running `go mod tidy` as part of `make vendor` target. This commit is the result of running fixed `make vendor`. Signed-off-by: Kir Kolyshkin <[email protected]>
fbba293 to
1a35fce
Compare
|
rebased on top of just-merged #4217; let's see how CI goes |
|
A bunch of weird errors from ci/prow/e2e-aws logs here, for example:
Otherwise everything seems much better. /test e2e-aws |
|
@kolyshkin: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
I'm not convinced e2e-aws ever really passes on master, I think there's something up with the setup. |
What type of PR is this?
/kind bug
What this PR does / why we need it:
This fixes running
go mod tidyas a part ofmake vendortarget.Please see commits for details.
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?