✨ Bump cluster-api dependency to v1.5.0-beta.1 #1970

chrischdi · 2023-07-04T08:06:58Z

What this PR does / why we need it:

This patch bumps the CAPI module dependency to `v1.5.0-beta.0 to integrate the latest minor beta release of CAPI with the CAPV release.

I tried to make meaningful commits for better reviewability. Summary:

capi: bump go modules to v1.5.0-beta.0 and move kustomize out of hack/tools
- Compiling kustomize broke with bumping the go modules.
- Adopting the way upstream CAPI uses to build the kustomize binary instead.
controller-gen: Regenerate CRDs
controller-runtime: adopt webhook changes in apis/v1beta1
- Webhooks are now able to return warning errors.
controller-runtime: fix unit-tests to due to new behavior of fake client
- Fake client requires to have a finalizer set when a DeletionTimestamp is set on object creation.
controller-runtime: fix CRD detection in main.go
- The returned errors of controller-runtime did change so the detection did not work anymore.
controller-runtime: use WithStatusSubresource when initializing fake-client for objects we update .status
controller-runtime: fix context and watch source handling
math/rand: fix usage
- Beginning with Go 1.20 rand gets auto-seeded on startup.
Adjust to not use deprecated fields and properties
nolint: use nolint:all to prevent gofmt of indenting it which makes lint cry

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 #1969

Special notes for your reviewer:

n/a

Release note:

Bump cluster-api dependency to v1.4.1

chrischdi · 2023-07-05T08:59:06Z

/test pull-cluster-api-provider-vsphere-verify-crds

chrischdi · 2023-07-05T14:03:01Z

/retest

chrischdi · 2023-07-05T14:03:22Z

Note: I'm not clear yet how flaky the existing tests are or if it is the PR.

chrischdi · 2023-07-05T15:04:27Z

/test pull-cluster-api-provider-vsphere-integration-test

chrischdi · 2023-07-05T15:17:47Z

/test pull-cluster-api-provider-vsphere-integration-test
/test pull-cluster-api-provider-vsphere-test

chrischdi · 2023-07-06T05:04:03Z

/test pull-cluster-api-provider-vsphere-verify-gen

chrischdi · 2023-07-06T06:07:32Z

/test help

k8s-ci-robot · 2023-07-06T06:07:33Z

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-vsphere-e2e
/test pull-cluster-api-provider-vsphere-full-e2e
/test pull-cluster-api-provider-vsphere-integration-test
/test pull-cluster-api-provider-vsphere-test
/test pull-cluster-api-provider-vsphere-verify-markdown
/test pull-cluster-api-provider-vsphere-verify-shell

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-vsphere-apidiff-main
/test pull-cluster-api-provider-vsphere-verify-crds
/test pull-cluster-api-provider-vsphere-verify-gen

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-vsphere-apidiff-main
pull-cluster-api-provider-vsphere-e2e
pull-cluster-api-provider-vsphere-integration-test
pull-cluster-api-provider-vsphere-test
pull-cluster-api-provider-vsphere-verify-crds
pull-cluster-api-provider-vsphere-verify-gen
pull-cluster-api-provider-vsphere-verify-shell

In response to this:

/test help

Instructions 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.

chrischdi · 2023-07-06T06:07:59Z

/test pull-cluster-api-provider-vsphere-full-e2e

chrischdi · 2023-07-06T07:40:25Z

@chrischdi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main a67c467 link false /test pull-cluster-api-provider-vsphere-apidiff-main
pull-cluster-api-provider-vsphere-test a67c467 link true /test pull-cluster-api-provider-vsphere-test
pull-cluster-api-provider-vsphere-full-e2e a67c467 link true /test pull-cluster-api-provider-vsphere-full-e2e
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Failure of capv-e2e: [It] Cluster creation with anti affined nodes should create a cluster with anti-affined nodes which is also red on testgrid's periodic-main-e2e already for a longer time.

chrischdi · 2023-07-06T08:41:59Z

/test pull-cluster-api-provider-vsphere-full-e2e

chrischdi · 2023-07-06T09:14:52Z

/test pull-cluster-api-provider-vsphere-verify-gen

chrischdi · 2023-07-06T12:55:41Z

@chrischdi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main 05dc4f3 link false /test pull-cluster-api-provider-vsphere-apidiff-main
pull-cluster-api-provider-vsphere-full-e2e 05dc4f3 link true /test pull-cluster-api-provider-vsphere-full-e2e
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

CI looks good.

apidiff failure is expected.
pull-cluster-api-provider-vsphere-full-e2e:
- Only fails in branch capv-e2e: [It] Cluster creation with anti affined nodes should create a cluster with anti-affined nodes
- This one is also red on main.

chrischdi · 2023-07-07T08:53:54Z

/test pull-cluster-api-provider-vsphere-full-e2e

sbueringer

New to CAPV, but from a CAPI/CR perspective overall this looks good

controllers/vmware/vspherecluster_reconciler_test.go

controllers/vspheremachine_controller.go

sbueringer · 2023-07-07T15:23:26Z

go.mod

@@ -1,18 +1,18 @@
 module sigs.k8s.io/cluster-api-provider-vsphere

-go 1.19
+go 1.20


I don't know enough about CAPV yet, but this usually requires bumping images used in Prow. Let's check

Valid point. Checked in test-infra:

The used images provide go 1.19.9.

So I reverted the go.mod version change for now. Let's keep this separately.

Can you open a follow-up issue to track this, please?

hack/go-install.sh

sbueringer · 2023-07-07T15:33:06Z

main.go

@@ -368,3 +372,22 @@ func runProfiler(addr string) {
 		setupLog.Error(err, "problem running profiler server")
 	}
 }
+
+func isCRDLoaded(mgr ctrlmgr.Manager, gvr schema.GroupVersionResource) (bool, error) {


Maybe isCRDDeployed would be better

Do we have e2e coverage that this new check works?

This is found very fast, because the controller won't get added and e2e tests would fail. (That's also how I recognized it).

Do you think that's already sufficient?

I was mostly wondering if we have e2e tests for both cases (now especially supervisor :D).

I think we should be good. I guess we have at least test coverage for the first case and if it works there it should also work for supervisor

Both cases are tested:

For supervisor: via make test-integration.

For non-supervisor: via make e2e.

randomvariable · 2023-07-11T12:04:37Z

Going to close out remaining dependabot PRs.

Can we therefore get the following in?

Bump golang.org/x/mod from 0.10.0 to 0.12.0
Bump github.com/stretchr/testify from 1.8.3 to 1.8.4
Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0

chrischdi · 2023-07-11T12:13:06Z

Going to close out remaining dependabot PRs.

Can we therefore get the following in?

Bump golang.org/x/mod from 0.10.0 to 0.12.0

Bump github.com/stretchr/testify from 1.8.3 to 1.8.4

Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0

bumped all three with the new commit.

chrischdi · 2023-07-11T12:13:14Z

/test pull-cluster-api-provider-vsphere-verify-crds

randomvariable · 2023-07-11T13:14:53Z

/test pull-cluster-api-provider-vsphere-verify-crds

chrischdi · 2023-07-11T13:42:01Z

Let's rebase again :P

…/tools Compiling kustomize broke with bumping the go modules. Adopting the way upstream CAPI uses to build the kustomize binary instead.

Webhooks are now able to return warning errors.

Fake client requires to have a finalizer set when a DeletionTimestamp is set on object creation.

The returned errors of controller-runtime did change so the detection did not work anymore.

…client for objects we update .status

Beginning with Go 1.20 rand gets auto-seeded on startup.

…int cry

…ts due to bind address already in use

k8s-ci-robot · 2023-07-11T13:50:16Z

@chrischdi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-vsphere-full-e2e	`6f39787`	link	true	`/test pull-cluster-api-provider-vsphere-full-e2e`
pull-cluster-api-provider-vsphere-apidiff-main	`7805709`	link	false	`/test pull-cluster-api-provider-vsphere-apidiff-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions 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.

sbueringer · 2023-07-11T13:59:16Z

/lgtm

randomvariable · 2023-07-11T14:06:55Z

/approve
/retest-required

k8s-ci-robot · 2023-07-11T14:07:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: randomvariable

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~~ [randomvariable]

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 added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 4, 2023

k8s-ci-robot requested a review from MaxRink July 4, 2023 08:07

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 4, 2023

k8s-ci-robot requested a review from srm09 July 4, 2023 08:07

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 4, 2023

chrischdi force-pushed the bump-capi-v1-5-beta branch from 216da21 to bf94956 Compare July 5, 2023 13:38

chrischdi force-pushed the bump-capi-v1-5-beta branch 2 times, most recently from 1c575d4 to e8609c3 Compare July 6, 2023 04:56

chrischdi force-pushed the bump-capi-v1-5-beta branch from e8609c3 to a67c467 Compare July 6, 2023 06:07

chrischdi changed the title ~~[WIP] ✨ Bump cluster-api dependency to v1.5.0-beta.0~~ ✨ Bump cluster-api dependency to v1.5.0-beta.0 Jul 6, 2023

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 Jul 6, 2023

chrischdi force-pushed the bump-capi-v1-5-beta branch from a67c467 to 1ccaabd Compare July 6, 2023 08:28

chrischdi changed the title ~~✨ Bump cluster-api dependency to v1.5.0-beta.0~~ ✨ Bump cluster-api dependency to v1.5.0-beta.1 Jul 6, 2023

chrischdi force-pushed the bump-capi-v1-5-beta branch from 1ccaabd to 05dc4f3 Compare July 6, 2023 08:41

chrischdi force-pushed the bump-capi-v1-5-beta branch from 05dc4f3 to 5ea79aa Compare July 7, 2023 06:21

sbueringer reviewed Jul 7, 2023

View reviewed changes

This was referenced Jul 11, 2023

🌱 Bump golang.org/x/oauth2 from 0.8.0 to 0.10.0 #1980

Closed

🌱 Bump golang.org/x/mod from 0.10.0 to 0.12.0 #1979

Closed

🌱 Bump github.com/stretchr/testify from 1.8.2 to 1.8.4 #1935

Closed

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

chrischdi added 12 commits July 11, 2023 15:45

capi: bump go modules to v1.5.0-beta.1 and move kustomize out of hack…

e394ebb

…/tools Compiling kustomize broke with bumping the go modules. Adopting the way upstream CAPI uses to build the kustomize binary instead.

controller-gen: Regenerate CRDs

72d2a60

controller-runtime: adopt webhook changes in apis/v1beta1

ce02109

Webhooks are now able to return warning errors.

controller-runtime: fix unit-tests to due to new behavior of fake client

e19a60b

Fake client requires to have a finalizer set when a DeletionTimestamp is set on object creation.

controller-runtime: fix CRD detection in main.go

19eec33

The returned errors of controller-runtime did change so the detection did not work anymore.

controller-runtime: use WithStatusSubresource when initializing fake-…

7f6624e

…client for objects we update .status

controller-runtime: fix context and watch source handling

7ce0bc4

math/rand: fix usage

9a7811a

Beginning with Go 1.20 rand gets auto-seeded on startup.

Adjust to not use deprecated fields and properties

7f09896

nolint: use nolint:all to prevent gofmt of indenting it which makes l…

6cd15ee

…int cry

controllers: disable metrics endpoint on tests to prevent flaky resul…

40df0e7

…ts due to bind address already in use

bump golang.org/x/mod github.com/stretchr/testify golang.org/x/oauth2

7805709

chrischdi force-pushed the bump-capi-v1-5-beta branch from 468352d to 7805709 Compare July 11, 2023 13:46

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

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 11, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 11, 2023

k8s-ci-robot merged commit 6d70d7e into kubernetes-sigs:main Jul 11, 2023
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Bump cluster-api dependency to v1.5.0-beta.1 #1970

✨ Bump cluster-api dependency to v1.5.0-beta.1 #1970

chrischdi commented Jul 4, 2023 •

edited

Loading

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

k8s-ci-robot commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 7, 2023

sbueringer left a comment

sbueringer Jul 7, 2023

chrischdi Jul 10, 2023

sbueringer Jul 10, 2023

sbueringer Jul 7, 2023

sbueringer Jul 7, 2023

chrischdi Jul 10, 2023

sbueringer Jul 10, 2023

sbueringer Jul 10, 2023

chrischdi Jul 11, 2023

randomvariable commented Jul 11, 2023

chrischdi commented Jul 11, 2023

chrischdi commented Jul 11, 2023

randomvariable commented Jul 11, 2023

chrischdi commented Jul 11, 2023

k8s-ci-robot commented Jul 11, 2023

sbueringer commented Jul 11, 2023

randomvariable commented Jul 11, 2023

k8s-ci-robot commented Jul 11, 2023

✨ Bump cluster-api dependency to v1.5.0-beta.1 #1970

✨ Bump cluster-api dependency to v1.5.0-beta.1 #1970

Conversation

chrischdi commented Jul 4, 2023 • edited Loading

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 5, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

k8s-ci-robot commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 6, 2023

chrischdi commented Jul 7, 2023

sbueringer 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

Choose a reason for hiding this comment

randomvariable commented Jul 11, 2023

chrischdi commented Jul 11, 2023

chrischdi commented Jul 11, 2023

randomvariable commented Jul 11, 2023

chrischdi commented Jul 11, 2023

k8s-ci-robot commented Jul 11, 2023

sbueringer commented Jul 11, 2023

randomvariable commented Jul 11, 2023

k8s-ci-robot commented Jul 11, 2023

chrischdi commented Jul 4, 2023 •

edited

Loading