Revendor gardener/[email protected] #183

prashanth26 · 2020-10-11T19:26:20Z

How to categorize this PR?

/area delivery
/kind enhancement
/priority normal
/platform gcp

What this PR does / why we need it:
Revendors the latest gardener/gardener vendors.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:
Code changes are inspired by gardener/gardener-extension-provider-openstack#155. Credits: @kon-angelo

Release note:

`github.com/gardener/gardener` dependency is now updated to `v1.11.1`.

prashanth26 · 2020-10-11T19:30:08Z

Hi,

I have tried to revendor g/[email protected]. However, when i locally run make test i am facing the following issue with this PR

fatal error: checkptr: converted pointer straddles multiple allocations

goroutine 1 [running, locked to thread]:
runtime.throw(0x32501c5, 0x3a)
	/usr/local/opt/go/libexec/src/runtime/panic.go:1116 +0x72 fp=0xc0004986c8 sp=0xc000498698 pc=0x1079d72
runtime.checkptrAlignment(0xc0000abbf8, 0x310f7c0, 0x1)
	/usr/local/opt/go/libexec/src/runtime/checkptr.go:20 +0xc9 fp=0xc0004986f8 sp=0xc0004986c8 pc=0x1049569
github.com/karrick/godirwalk.readDirents(0xc0005b5fb0, 0x2b, 0xc0000ab000, 0x1000, 0x1000, 0x0, 0xc000000180, 0xc0004988c8, 0x10aeea8, 0xc000000180)
	/Users/i341888/Go/src/github.com/gardener/gardener-extension-provider-gcp/vendor/github.com/karrick/godirwalk/readdir_unix.go:51 +0x18c fp=0xc000498860 sp=0xc0004986f8 pc=0x2db9b6c
github.com/karrick/godirwalk.ReadDirents(...)

However, when I run the same without the -race option in the go test it works well. I tried to debug to find out the root cause, however, I was unable to find the root cause. Any ideas?

cc: @kon-angelo

ialidzhikov · 2020-10-11T19:32:40Z

See gobuffalo/packr#261. For me it works fine using make test in docker container

$ docker run --rm -v ${GOPATH}/src:/go/src -it golang:1.15.2 bash
# cd src/github.com/gardener/gardener-extension-provider-gcp
# make test

kon-angelo · 2020-10-11T19:33:12Z

That is exactly the issue I had with my local setup too.

prashanth26 · 2020-10-11T19:37:39Z

@ialidzhikov - I got a hint that it was an issue with my underlying setup. I tried upgrading my golang but didn't help. However, this issue explains it. Thanks for the hint. Saved my time 👍

@kon-angelo - Yes, I remember you vaguely mentioning this in the meeting and hence tagged you. Thank you as well 👍

kon-angelo

/lgtm

Because our PRs are similar you could wait for a third opinion too :)

ialidzhikov

Can you add "SKIP_FETCH_TOOLS=1" to make test?

ialidzhikov · 2020-10-11T22:14:50Z

Makefile

@@ -127,7 +127,7 @@ format:

 .PHONY: test
 test:
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test.sh ./cmd/... ./pkg/...
+	@SKIP_FETCH_TOOLS=1 $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test.sh ./cmd/... ./pkg/...


Can you add it also to test-cov?

Done. Here - 082dd68#diff-b67911656ef5d18c4ae36cb6741b7965R134

ialidzhikov · 2020-10-11T22:15:49Z

pkg/controller/worker/machines_test.go

+						Object: expectedImages,
+					}
+					ctx := context.TODO()
+					c.EXPECT().Get(ctx, gomock.Any(), gomock.AssignableToTypeOf(&extensionsv1alpha1.Worker{})).


Suggested change

c.EXPECT().Get(ctx, gomock.Any(), gomock.AssignableToTypeOf(&extensionsv1alpha1.Worker{})).

c.EXPECT().Get(ctx, gomock.Any(), gomock.AssignableToTypeOf(&extensionsv1alpha1.Worker{})).Return(nil)

You meant this right? - 082dd68#diff-e61377d85357d3c316ed34aa40a57057R560

ialidzhikov

/lgtm

prashanth26 added 2 commits October 11, 2020 22:11

Revendored gardener/[email protected]

27c3e0f

Additional changes

5f46695

prashanth26 requested review from a team as code owners October 11, 2020 19:26

gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 11, 2020

gardener-robot added the size/l Size of pull request is large (see gardener-robot robot/bots/size.py) label Oct 11, 2020

gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 11, 2020

prashanth26 changed the title ~~Revendor/[email protected]~~ Revendor gardener/[email protected] Oct 11, 2020

kon-angelo previously approved these changes Oct 11, 2020

View reviewed changes

gardener-robot added reviewed/lgtm Has approval for merging and removed needs/review Needs review needs/second-opinion Needs second review by someone else labels Oct 11, 2020

ialidzhikov requested changes Oct 11, 2020

View reviewed changes

gardener-robot added needs/changes Needs (more) changes and removed reviewed/lgtm Has approval for merging labels Oct 11, 2020

Make generate

ef46c25

prashanth26 dismissed kon-angelo’s stale review via d8d5113 October 11, 2020 20:05

prashanth26 force-pushed the revendor/[email protected] branch from 34470e3 to d8d5113 Compare October 11, 2020 20:05

ialidzhikov reviewed Oct 11, 2020

View reviewed changes

gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 12, 2020

gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 12, 2020

prashanth26 force-pushed the revendor/[email protected] branch from 448ed9b to 4d2805f Compare October 12, 2020 04:22

gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 12, 2020

gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 12, 2020

Add SKIP_FETCH_TOOLS=1 and Minor nits

082dd68

prashanth26 force-pushed the revendor/[email protected] branch from 4d2805f to 082dd68 Compare October 12, 2020 04:25

gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 12, 2020

ialidzhikov approved these changes Oct 12, 2020

View reviewed changes

gardener-robot added reviewed/lgtm Has approval for merging needs/changes Needs (more) changes and removed needs/changes Needs (more) changes needs/second-opinion Needs second review by someone else reviewed/lgtm Has approval for merging labels Oct 12, 2020

ialidzhikov merged commit 80850ba into gardener:master Oct 12, 2020

vpnachev mentioned this pull request Oct 12, 2020

Vendor gardener/gardener 1.11.1 gardener/gardener-extension-provider-azure#175

Merged

gardener-robot added priority/3 Priority (lower number equals higher priority) and removed priority/3 Priority (lower number equals higher priority) labels Mar 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revendor gardener/[email protected] #183

Revendor gardener/[email protected] #183

prashanth26 commented Oct 11, 2020 •

edited by ialidzhikov

Loading

prashanth26 commented Oct 11, 2020

ialidzhikov commented Oct 11, 2020

kon-angelo commented Oct 11, 2020

prashanth26 commented Oct 11, 2020

kon-angelo left a comment

ialidzhikov left a comment

ialidzhikov Oct 11, 2020

prashanth26 Oct 12, 2020

ialidzhikov Oct 11, 2020

prashanth26 Oct 12, 2020

ialidzhikov left a comment

	c.EXPECT().Get(ctx, gomock.Any(), gomock.AssignableToTypeOf(&extensionsv1alpha1.Worker{})).
	c.EXPECT().Get(ctx, gomock.Any(), gomock.AssignableToTypeOf(&extensionsv1alpha1.Worker{})).Return(nil)

Revendor gardener/[email protected] #183

Revendor gardener/[email protected] #183

Conversation

prashanth26 commented Oct 11, 2020 • edited by ialidzhikov Loading

prashanth26 commented Oct 11, 2020

ialidzhikov commented Oct 11, 2020

kon-angelo commented Oct 11, 2020

prashanth26 commented Oct 11, 2020

kon-angelo left a comment

Choose a reason for hiding this comment

ialidzhikov left a comment

Choose a reason for hiding this comment

ialidzhikov Oct 11, 2020

Choose a reason for hiding this comment

prashanth26 Oct 12, 2020

Choose a reason for hiding this comment

ialidzhikov Oct 11, 2020

Choose a reason for hiding this comment

prashanth26 Oct 12, 2020

Choose a reason for hiding this comment

ialidzhikov left a comment

Choose a reason for hiding this comment

prashanth26 commented Oct 11, 2020 •

edited by ialidzhikov

Loading