bump CAPI to v1.1.0 #1137

jichenjc · 2022-02-09T01:54:09Z

What this PR does / why we need it:

bump CAPI to 1.1.0
update docker from 1.16 to 1.17 (otherwise lead to something like install controller-gen failed: sf.IsExported undefined controller-tools#643)
update test to fit for CAPI 1.0.4->1.1.0 update (e.g logr from 0.4 to 1.2)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

squashed commits
if necessary:
- includes documentation
- adds unit tests

/hold

netlify · 2022-02-09T01:54:15Z

✔️ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

🔨 Explore the source changes: 0c720bd

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/620479283028c60007605a95

😎 Browse the preview: https://deploy-preview-1137--kubernetes-sigs-cluster-api-openstack.netlify.app

jichenjc · 2022-02-09T01:54:48Z

give a try on v110 per discussion in CAPI #6080

jichenjc · 2022-02-09T02:15:35Z

/test pull-cluster-api-provider-openstack-test

jichenjc · 2022-02-09T05:54:20Z

/retest

jichenjc · 2022-02-10T00:26:55Z

/retest

jichenjc · 2022-02-10T03:56:51Z

/retest

jichenjc · 2022-02-10T05:35:01Z

@mdbooth can you take a quick look? Thanks

mdbooth

I'm a bit concerned by all the noise in go.mod, and by the appearance of a second require block. However, I'm guessing you didn't write that by hand! Any idea what's going on there?

mdbooth · 2022-02-10T09:35:33Z

go.mod

+require (
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/MakeNowJust/heredoc v1.0.0 // indirect
+	github.com/Microsoft/go-winio v0.5.0 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
+	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/containerd/containerd v1.5.9 // indirect
+	github.com/coredns/caddy v1.1.0 // indirect
+	github.com/coredns/corefile-migration v1.0.14 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/docker v20.10.12+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/gobuffalo/flect v0.2.4 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/cel-go v0.9.0 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/go-github/v33 v33.0.0 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.28.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/cobra v1.2.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/viper v1.9.0 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/valyala/fastjson v1.6.3 // indirect
+	golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
+	google.golang.org/grpc v1.42.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/apiextensions-apiserver v0.23.0 // indirect
+	k8s.io/apiserver v0.23.0 // indirect
+	k8s.io/cluster-bootstrap v0.23.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/kind v0.11.1 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
+)


Any idea where this appeared from?

I'm guessing you didn't write that by hand! Any idea what's going on there?

yes, I didn't do it manually...

and I think it do no harm ? I don't know why update to 1.1.0 introduce so much changes

the //indirect is not something familiar to me , will do some home work..

https://github.com/kubernetes-sigs/cluster-api/blob/main/go.mod#L51
capi also has this kind of stuffs

not find the real solution yet, but seems other folks has same questions as well
https://stackoverflow.com/questions/61115111/how-to-avoid-indirect-dependencies-in-go-mod-file

Also curious why only this update (maybe go16->17?) trigger this...

I saw this happening locally when upgrading from go 1.16 to 1.17. I just checked and it's in the release notes for 1.17: https://go.dev/doc/go1.17#graph-pruning

Because the number of explicit requirements may be substantially larger in an expanded Go 1.17 go.mod file, the newly-added requirements on indirect dependencies in a go 1.17 module are maintained in a separate require block from the block containing direct dependencies.

mdbooth · 2022-02-10T09:39:14Z

pkg/cloud/services/networking/floatingip_test.go

@@ -77,7 +76,6 @@ func Test_GetOrCreateFloatingIP(t *testing.T) {
 			tt.expect(mockClient.EXPECT())
 			s := Service{
 				client: mockClient,
-				logger: logr.DiscardLogger{},


Why was this removed?

check the commit msg :)

the logr 0.4=>1.2 update makes this happen :)

mdbooth · 2022-02-10T09:40:17Z

pkg/cloud/services/networking/port_test.go

@@ -439,7 +438,6 @@ func Test_GetOrCreatePort(t *testing.T) {
 			tt.expect(mockClient.EXPECT())
 			s := Service{
 				client: mockClient,
-				logger: logr.DiscardLogger{},


And again. Is there some behaviour change in logr which means calling methods on a nil logr doesn't error?

mdbooth

I don't understand specifically why these new requires have turned up with this change, but having looked they're all clearly required. Suspect the answer is probably go 1.17, although that's purely a guess.

Also having the indirects in a separate requires is somewhat tidier. Despite my initial surprise I think I prefer it.

Incidentally, most of these deps seem to be pulled in via sigs.k8s.io/cluster-api/test, which is a separate module in CAPI. I wonder if we should also pull our e2e tests into a separate module to minimise the blast radius. @sbueringer do you happen to know if other projects are doing this?

/lgtm

k8s-ci-robot · 2022-02-10T10:14:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jichenjc, mdbooth

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:

~~OWNERS~~ [jichenjc,mdbooth]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

mdbooth · 2022-02-10T10:16:25Z

/lgtm

sbueringer · 2022-02-10T13:49:06Z

I don't understand specifically why these new requires have turned up with this change, but having looked they're all clearly required. Suspect the answer is probably go 1.17, although that's purely a guess.

Also having the indirects in a separate requires is somewhat tidier. Despite my initial surprise I think I prefer it.

Incidentally, most of these deps seem to be pulled in via sigs.k8s.io/cluster-api/test, which is a separate module in CAPI. I wonder if we should also pull our e2e tests into a separate module to minimise the blast radius. @sbueringer do you happen to know if other projects are doing this?

/lgtm

Yes go 1.17 introduced the new "go.mod format"

Afaik only core CAPI has a separate module. There is a somewhat related suggestion on that issue: kubernetes-sigs/cluster-api#6081 (comment)

But I don't know what I personally would prefer.

jichenjc · 2022-02-11T01:32:26Z

/hold cancel

jichenjc · 2022-02-11T01:37:20Z

/retest

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 9, 2022

k8s-ci-robot requested review from chrischdi and hidekazuna February 9, 2022 01:54

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2022

jichenjc force-pushed the testv110 branch from 24640e7 to e9e777d Compare February 9, 2022 03:32

jichenjc force-pushed the testv110 branch 3 times, most recently from 02c5344 to 158596c Compare February 9, 2022 09:30

jichenjc mentioned this pull request Feb 9, 2022

🐛Remove v1.0.x as CAPO don't have that version until now #1135

Closed

3 tasks

jichenjc force-pushed the testv110 branch from 158596c to 5e56a13 Compare February 9, 2022 10:56

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 10, 2022

jichenjc force-pushed the testv110 branch from 5e56a13 to c88d553 Compare February 10, 2022 00:39

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 10, 2022

bump CAPI to 1.1.0

0c720bd

jichenjc force-pushed the testv110 branch from c88d553 to 0c720bd Compare February 10, 2022 02:32

jichenjc changed the title ~~WIP: bump CAPI to v1.1.0~~ bump CAPI to v1.1.0 Feb 10, 2022

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 10, 2022

mdbooth reviewed Feb 10, 2022

View reviewed changes

mdbooth approved these changes Feb 10, 2022

View reviewed changes

k8s-ci-robot assigned mdbooth Feb 10, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 10, 2022

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2022

k8s-ci-robot merged commit 1b7e8da into kubernetes-sigs:main Feb 11, 2022

chrischdi mentioned this pull request Mar 3, 2022

🐛 Bump CAPI to v1.0.4 #1133

Closed

chrischdi mentioned this pull request Apr 19, 2022

🐛 bump CAPI to v1.1.3 #1209

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump CAPI to v1.1.0 #1137

bump CAPI to v1.1.0 #1137

jichenjc commented Feb 9, 2022 •

edited

Loading

netlify bot commented Feb 9, 2022 •

edited

Loading

jichenjc commented Feb 9, 2022

jichenjc commented Feb 9, 2022

jichenjc commented Feb 9, 2022

jichenjc commented Feb 10, 2022

jichenjc commented Feb 10, 2022

jichenjc commented Feb 10, 2022

mdbooth left a comment

mdbooth Feb 10, 2022

jichenjc Feb 10, 2022

jichenjc Feb 10, 2022

jichenjc Feb 10, 2022

apricote Feb 10, 2022

mdbooth Feb 10, 2022

jichenjc Feb 10, 2022

mdbooth Feb 10, 2022

mdbooth left a comment •

edited

Loading

k8s-ci-robot commented Feb 10, 2022

mdbooth commented Feb 10, 2022

sbueringer commented Feb 10, 2022

jichenjc commented Feb 11, 2022

jichenjc commented Feb 11, 2022

bump CAPI to v1.1.0 #1137

bump CAPI to v1.1.0 #1137

Conversation

jichenjc commented Feb 9, 2022 • edited Loading

netlify bot commented Feb 9, 2022 • edited Loading

jichenjc commented Feb 9, 2022

jichenjc commented Feb 9, 2022

jichenjc commented Feb 9, 2022

jichenjc commented Feb 10, 2022

jichenjc commented Feb 10, 2022

jichenjc commented Feb 10, 2022

mdbooth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mdbooth left a comment • edited Loading

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 10, 2022

mdbooth commented Feb 10, 2022

sbueringer commented Feb 10, 2022

jichenjc commented Feb 11, 2022

jichenjc commented Feb 11, 2022

jichenjc commented Feb 9, 2022 •

edited

Loading

netlify bot commented Feb 9, 2022 •

edited

Loading

mdbooth left a comment •

edited

Loading