Bump CAPI core to v1beta1 #927

saimanoj01 · 2021-10-19T23:58:11Z

What this PR does / why we need it

Bump cluster-api core to v1.0.0 (v1beta1).
Bump capa, capv, capz providers to v1.0.0.
Rename --metrics-addr to --metrics-bind-addr and --leader-election to --leader-elect to align with cluster-api (Addons controller support for cluster api v1beta1 #654 (comment))
Address removal of clusterctl --watching-namespace (⚠️ Remove clusterctl --watching-namespace kubernetes-sigs/cluster-api#4666)
Address of clusterctl management groups (⚠️ Remove clusterctl management groups kubernetes-sigs/cluster-api#4668)
Fixed an issue with management-cluster upgrade for docker provider and added a unit test for it.

We will need to do this in order to bump k8s version to 1.22. Kubernetes 1.22 will not be capable of being lifecycled by v1alpha3 components.

Which issue(s) this PR fixes

Fixes #936, #654

Describe testing done for PR

Created management clusters on vSphere, Azure and AWS infrastructures.
Verified upgrading the management clusters from TKG 1.4.
Successfully created workload clusters on all supporting infrastructures.

Release note

bump capi core to v1beta1

- update capi/capa/capz/capv to v1.0.0
- update controller-runtime to v0.10.2
- rename --metrics-addr to --metrics-bind-addr and --leader-election to --leader-elect to align with cluster-api for addons-manager

PR Checklist

Squash the commits into one or a small number of logical commits
Use good commit messages
Ensure PR contains terms all contributors can understand and links all contributors can access

Additional information

Special notes for your reviewer

github-actions · 2021-10-20T17:44:24Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211020174422/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-20T18:57:00Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211020185658/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-20T21:04:55Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211020210453/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-20T22:48:48Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211020224846/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-21T00:17:09Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211021001706/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-21T01:28:18Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211021012815/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-21T07:06:22Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211021070620/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-21T19:22:13Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211021192210/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-22T04:48:57Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211022044855/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-26T00:40:48Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211026004046/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-28T06:15:36Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211028061535/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-28T06:22:46Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211028062243/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-10-30T01:01:10Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211030010108/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-01T12:02:51Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211101120249/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

saimanoj01 · 2021-11-01T17:35:18Z

//usebom:sandbox/v1.5.0-zshippable/379567558421927594/tkg-compatibility

github-actions · 2021-11-01T18:51:32Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211101185129/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-01T19:00:56Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211101190053/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-02T01:02:45Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211102010243/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

saimanoj01 · 2021-11-02T16:57:09Z

//usebom:sandbox/v1.5.0-zshippable/379670967577783610/tkg-compatibility

pkg/v1/tkr/controllers/source/tkr_source_controller.go

imikushin

A few mostly minor comments. Otherwise looks good!

A change like this (transitioning between Cluster API versions) can only be done in one big bang, so kudos for the hard work!

Appreciate the amount of effort that went into this. Let's resolve the comments and get this in!

addons/main.go

pkg/v1/sdk/capabilities/controllers/capability_controller.go

pkg/v1/sdk/capabilities/discovery/cluster_object.go

pkg/v1/sdk/capabilities/discovery/tkg/cloudprovider_test.go

pkg/v1/sdk/capabilities/discovery/tkg/infraprovider_test.go

pkg/v1/tkg/tkgconfigbom/bom.go

pkg/v1/tkg/client/client.go

pkg/v1/tkg/utils/common.go

pkg/v1/tkg/yamlprocessor/ytt.go

pkg/v1/tkr/controllers/source/tkr_source_controller.go

vijaykatam

Looks good overall. Minor comments.

addons/go.mod

addons/main.go

go.mod

github-actions · 2021-11-03T19:52:32Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211103195230/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-03T20:57:38Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211103205736/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-03T21:10:17Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211103211015/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

saimanoj01 · 2021-11-03T22:20:17Z

//usebom:sandbox/v1.5.0-zshippable/379911975624294967/tkg-compatibility

prkalle

Thank you for the changes, huge effort!! The changes look good to me with one comment.

pkg/v1/providers/infrastructure-azure/v1.0.0/ytt/overlay.yaml

pkg/v1/tkg/client/describe_cluster.go

github-actions · 2021-11-03T23:04:26Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211103230423/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-03T23:33:55Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211103233352/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T05:44:20Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104054418/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T06:34:52Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104063450/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

rajathagasthya

Just a couple of minor, non-blocking comments. Thanks for the changes, this is a lot of effort!

pkg/v1/sdk/features/controllers/featuregate_controller.go

pkg/v1/sdk/capabilities/controllers/capability_controller.go

github-actions · 2021-11-04T18:33:38Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104183336/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T18:43:21Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104184319/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T18:56:57Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104185654/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T19:19:14Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104191912/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T19:45:15Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104194512/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2021-11-04T19:57:03Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104195701/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

danniel1205

Reviewed addons component. LGTM

github-actions · 2021-11-04T21:02:33Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104210230/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

pkg/v1/tkr/controllers/source/tkr_source_controller.go

imikushin

Looks good!

github-actions · 2021-11-04T21:54:08Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211104215406/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

tenczar

LGTM. I think the changes from 0.7.11 made it into 1.0.1 is that your understanding as well? If not, we will have a regression from 1.4.1 to 1.5

tenczar · 2021-11-04T22:48:13Z

pkg/v1/providers/infrastructure-azure/v1.0.0/ytt/base-template.yaml

@@ -139,7 +144,6 @@ spec:
        - diskSizeGB: 256
          lun: 0
          nameSuffix: etcddisk
-      location: ${AZURE_LOCATION}


I noticed that this location property has been removed from the various AzureMachineTemplate in our ytt templates. I assume this means that it isn't need (should be provided in the MachineDeployment anyway)

- change addons-manager to adopt cluster-api v1beta1 - bump controller-runtime version to align with cluster-api - fix the addons integ tests by updating the way how kubeconfig is generated. This change is required to make latest envtest work. Signed-off-by: Daniel Guo <[email protected]>

github-actions · 2021-11-05T08:36:25Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/927/20211105083622/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

vmwclabot added the cla-not-required label Oct 19, 2021

randomvariable mentioned this pull request Oct 20, 2021

Update to Cluster API v1.0.0 #936

Closed

11 tasks

saimanoj01 commented Nov 2, 2021

View reviewed changes

pkg/v1/tkr/controllers/source/tkr_source_controller.go Outdated Show resolved Hide resolved

saimanoj01 marked this pull request as ready for review November 2, 2021 18:48

saimanoj01 requested review from prkalle and a team as code owners November 2, 2021 18:48

saji-pivotal approved these changes Nov 2, 2021

View reviewed changes

imikushin reviewed Nov 2, 2021

View reviewed changes

vijaykatam reviewed Nov 3, 2021

View reviewed changes

addons/go.mod Show resolved Hide resolved

addons/main.go Show resolved Hide resolved

go.mod Show resolved Hide resolved

prkalle reviewed Nov 3, 2021

View reviewed changes

pkg/v1/providers/infrastructure-azure/v1.0.0/ytt/overlay.yaml Show resolved Hide resolved

pkg/v1/tkg/client/describe_cluster.go Show resolved Hide resolved

danniel1205 added the ok-to-merge PRs should be labelled with this before merging label Nov 3, 2021

rajathagasthya approved these changes Nov 4, 2021

View reviewed changes

pkg/v1/sdk/features/controllers/featuregate_controller.go Outdated Show resolved Hide resolved

pkg/v1/sdk/capabilities/controllers/capability_controller.go Outdated Show resolved Hide resolved

danniel1205 approved these changes Nov 4, 2021

View reviewed changes

imikushin reviewed Nov 4, 2021

View reviewed changes

pkg/v1/tkr/controllers/source/tkr_source_controller.go Outdated Show resolved Hide resolved

saimanoj01 requested a review from imikushin November 4, 2021 21:46

imikushin approved these changes Nov 4, 2021

View reviewed changes

tenczar approved these changes Nov 4, 2021

View reviewed changes

saimanoj01 and others added 3 commits November 5, 2021 01:21

update capi core to v1.0.0 (v1beta1)

86287b1

update capz to v1.0.0 and capa to v1.0.1

0e90ba9

saimanoj01 merged commit e67e6a0 into vmware-tanzu:main Nov 5, 2021

danniel1205 mentioned this pull request Nov 8, 2021

Addons controller support for cluster api v1beta1 #654

Closed

9 tasks

rajaskakodkar mentioned this pull request Nov 22, 2021

Update BoM retrieval version to 0.11.1 rajaskakodkar/tanzu-framework#1

Closed

Bump CAPI core to v1beta1 #927

Bump CAPI core to v1beta1 #927

Conversation

saimanoj01 commented Oct 19, 2021 • edited Loading

What this PR does / why we need it

Which issue(s) this PR fixes

Describe testing done for PR

Release note

PR Checklist

Additional information

Special notes for your reviewer

github-actions bot commented Oct 20, 2021

github-actions bot commented Oct 20, 2021

github-actions bot commented Oct 20, 2021

github-actions bot commented Oct 20, 2021

github-actions bot commented Oct 21, 2021

github-actions bot commented Oct 21, 2021

github-actions bot commented Oct 21, 2021

github-actions bot commented Oct 21, 2021

github-actions bot commented Oct 22, 2021

github-actions bot commented Oct 26, 2021

github-actions bot commented Oct 28, 2021

github-actions bot commented Oct 28, 2021

github-actions bot commented Oct 30, 2021

github-actions bot commented Nov 1, 2021

saimanoj01 commented Nov 1, 2021

github-actions bot commented Nov 1, 2021

github-actions bot commented Nov 1, 2021

github-actions bot commented Nov 2, 2021

saimanoj01 commented Nov 2, 2021

imikushin left a comment

Choose a reason for hiding this comment

vijaykatam left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 3, 2021

github-actions bot commented Nov 3, 2021

github-actions bot commented Nov 3, 2021

saimanoj01 commented Nov 3, 2021

prkalle left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Nov 3, 2021

github-actions bot commented Nov 3, 2021

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

rajathagasthya left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

github-actions bot commented Nov 4, 2021

danniel1205 left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 4, 2021

imikushin left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 4, 2021

tenczar left a comment

Choose a reason for hiding this comment

tenczar Nov 4, 2021

Choose a reason for hiding this comment

github-actions bot commented Nov 5, 2021

saimanoj01 commented Oct 19, 2021 •

edited

Loading

prkalle left a comment •

edited

Loading