refactor: Use separate types for provider cluster configs #537

jimmidyson · 2024-04-18T17:10:42Z

What problem does this PR solve?:
This commit also switches to using controller-gen generated CRDs
for the OpenAPI schema for the variable definitions.

A lot of this commit is refactoring tests.

The mechanism for defining the variable schema changes with this PR, meaning that a developer now defines variable with standard CRD mechanisms and kubebuilder annotations, rather than defining the manually constructed VariableSchema functions for each type previously.

Which issue(s) this PR fixes:
Fixes #

How Has This Been Tested?:

Special notes for your reviewer:

Depends on #536.

dkoshkin

I like this change, I just don't really understand yet how we will accomplish the previous behavior of having different defaults for cp and workers.

api/v1alpha1/nutanix_node_types.go

common/pkg/capi/clustertopology/variables/fromcrdyaml.go

go.mod

api/v1alpha1/clusterconfig_types.go

pkg/handlers/aws/mutation/instancetype/variables_test.go

github-actions · 2024-04-22T18:35:30Z

This PR/issue depends on:

~~build: Generate CRD YAML #536~~
By Dependent Issues (🤖). Happy coding!

api/v1alpha1/aws_node_types.go

api/v1alpha1/clusterconfig_types.go

api/v1alpha1/nutanix_clusterconfig_types.go

api/v1alpha1/aws_node_types.go

dkoshkin

Great changes! I appreciate how this doesn't change the external API (visible by no changes to the examples).

Just a couple of comments to remove some stale vars.

Tested with CAPX and AWS

NAME                                                                                READY  SEVERITY  REASON  SINCE  MESSAGE 
Cluster/dkkonvoy-042224-01                                                          True                     3m27s           
├─ClusterInfrastructure - NutanixCluster/dkkonvoy-042224-01-7ll46                                                            
├─ControlPlane - KubeadmControlPlane/dkkonvoy-042224-01-brbbg                       True                     3m27s           
│ └─Machine/dkkonvoy-042224-01-brbbg-6nk65                                          True                     3m47s           
│   └─MachineInfrastructure - NutanixMachine/dkkonvoy-042224-01-46dk4-h7pqr                                                  
└─Workers                                                                                                                    
  └─MachineDeployment/dkkonvoy-042224-01-md-0-qhlb7                                 True                     104s            
    └─Machine/dkkonvoy-042224-01-md-0-qhlb7-546dt-c79ck                             True                     2m4s            
      └─MachineInfrastructure - NutanixMachine/dkkonvoy-042224-01-md-0-24rgj-tjrll

NAME                                                               READY  SEVERITY  REASON  SINCE  MESSAGE 
Cluster/dkkonvoy-042224-aws-01                                     True                     3m13s           
├─ClusterInfrastructure - AWSCluster/dkkonvoy-042224-aws-01-kkzxw  True                     5m31s           
├─ControlPlane - KubeadmControlPlane/dkkonvoy-042224-aws-01-rts9z  True                     3m13s           
│ └─Machine/dkkonvoy-042224-aws-01-rts9z-h6d64                     True                     5m23s           
└─Workers                                                                                                   
  └─MachineDeployment/dkkonvoy-042224-aws-01-md-0-vtwdk            True                     81s             
    └─Machine/dkkonvoy-042224-aws-01-md-0-vtwdk-98crs-qxvtd        True                     2m26s

This commit also switches to using controller-gen generated CRDs for the OpenAPI schema for the variable definitions. A lot of this commit is refactoring tests.

This was never used anywhere.

api/v1alpha1/addon_types.go

deepakm-ntnx

Looks great. Thanks for the change to use types instead of handcrafted variables

@faiq

🤖 I have created a release *beep* *boop* --- ## 0.8.0 (2024-04-29)  ## What's Changed ### Exciting New Features 🎉 * feat: give mutators a clusterGetter function by @faiq in https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pull/514it was unintelliga * feat: get default sans via cluster object in patch handler for docker by @faiq in #519 * feat: adds nutanix SANs via patchHandler by @faiq in #522 * feat: nutanix csi driver 3.0 by @faiq in #531 * feat: Add additionalCategories field to Nutanix machine details patch by @dlipovetsky in #525 * feat: support setting Nutanix project on machines by @dkoshkin in #535 * feat: Upgrade to CAPI v1.7.0 by @jimmidyson in #555 * feat: CAPI v1.7.1 by @jimmidyson in #560 * feat: Preserve user-managed fields when applying resources by @dlipovetsky in #556 * feat: Preserve user-managed fields when creating namespace by @dlipovetsky in #557 * feat: Added e2e test for capx cluster by @deepakm-ntnx in #523 * feat: add kube-vip static Pod in a Nutanix handler by @dkoshkin in #558 * feat: AWS CCM for Kubernetes v1.29 by @dkoshkin in #564 ### Fixes 🔧 * fix: updated the capx version used by @deepakm-ntnx in #513 * fix: add omitempty to CCM Credentials struct by @dkoshkin in #524 * fix: Add specific descriptions to Nutanix machine details fields by @dlipovetsky in #532 * refactor: setting ownership references to Nutanix CSI Helm Chart Proxies by @dlipovetsky in #565 ### Other Changes * build: Specify go1.22.2 as toolchain to fix govulncheck issues by @jimmidyson in #517 * build: Add metadata for latest v0.7.0 release by @jimmidyson in #515 * refactor: Consistently import CAPI v1beta1 package as clusterv1 alias by @jimmidyson in #518 * build: Fix image tags in release manifests by @jimmidyson in #516 * test(e2e): Use same versions of providers from module dependencies by @jimmidyson in #521 * build: update aws credentials on kind bootstrap cluster by @supershal in #507 * refactor: standardize the code for getting Helm values by @dkoshkin in #500 * build: Use latest k8s for dev and test management cluster by @jimmidyson in #526 * docs: Add how to release doc by @jimmidyson in #530 * build: adds a .envrc.local file for local development for dotenv by @faiq in #538 * refactor: create storage classes directly instead of using CRS by @faiq in #539 * refactor: Move API to caren.nutanix.com group by @jimmidyson in #534 * build: Add Kubernetes v1.30.0 option for bootstrap and Docker provider by @jimmidyson in #541 * build: create .envrc.e2e file from caren e2e config by @supershal in #540 * build: Only allow patch updates to k8s libs by @jimmidyson in #551 * build: Generate CRD YAML by @jimmidyson in #536 * build: Minor golangci-lint config updates for recent versions by @jimmidyson in #552 * build: generated CRDs yamls by @dkoshkin in #553 * refactor: Use separate types for provider cluster configs by @jimmidyson in #537 * docs: Remove additionalCategories from required fields by @dlipovetsky in #543 * build: Upgrade tooling, notably go to v1.22.2 by @jimmidyson in #561 * refactor: provider an entrypoint to the infra provider meta handlers by @dkoshkin in #554 * test(e2e): Add self-hosted e2e test by @jimmidyson in #439 * build: Bundle k8s.io/* back in with sigs.k8s.io/* dependencies by @jimmidyson in #583 * build: Add envtest setup to e2e envrc by @jimmidyson in #563 ## New Contributors * @deepakm-ntnx made their first contribution in #513 **Full Changelog**: v0.7.0...v0.8.0 --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

jimmidyson requested review from dlipovetsky, dkoshkin, faiq, supershal and deepakm-ntnx April 18, 2024 17:10

github-actions bot added the stacked label Apr 18, 2024

dkoshkin reviewed Apr 18, 2024

View reviewed changes

jimmidyson force-pushed the jimmi/controller-gen branch from ce225f6 to c2dbdce Compare April 19, 2024 08:18

jimmidyson force-pushed the jimmi/crd-based-variables-schema branch from e173208 to d34afb1 Compare April 19, 2024 08:19

Base automatically changed from jimmi/controller-gen to main April 22, 2024 18:35

github-actions bot removed the stacked label Apr 22, 2024

dkoshkin reviewed Apr 22, 2024

View reviewed changes

api/v1alpha1/aws_node_types.go Show resolved Hide resolved

dkoshkin reviewed Apr 22, 2024

View reviewed changes

api/v1alpha1/clusterconfig_types.go Show resolved Hide resolved

dkoshkin reviewed Apr 22, 2024

View reviewed changes

api/v1alpha1/nutanix_clusterconfig_types.go Show resolved Hide resolved

supershal reviewed Apr 22, 2024

View reviewed changes

api/v1alpha1/aws_node_types.go Show resolved Hide resolved

dkoshkin approved these changes Apr 22, 2024

View reviewed changes

jimmidyson added 5 commits April 23, 2024 16:31

refactor: Use separate types for provider cluster configs

0fe936d

This commit also switches to using controller-gen generated CRDs for the OpenAPI schema for the variable definitions. A lot of this commit is refactoring tests.

fixup! refactor: Add more kubebuilder annotations

420eb16

fix: Remove generic cluster config variable

b35f955

This was never used anywhere.

refactor: Separate defaults for worker and CP AWS nodes

4203073

revert: Accidentally reverted changes from separate PR

91ea6f2

jimmidyson force-pushed the jimmi/crd-based-variables-schema branch from 8ef41bb to 91ea6f2 Compare April 23, 2024 16:18

fixup! refactor: Delete unused code

0390f6c

jimmidyson enabled auto-merge (squash) April 23, 2024 16:37

deepakm-ntnx reviewed Apr 23, 2024

View reviewed changes

api/v1alpha1/addon_types.go Show resolved Hide resolved

supershal approved these changes Apr 23, 2024

View reviewed changes

deepakm-ntnx approved these changes Apr 23, 2024

View reviewed changes

jimmidyson merged commit 74f4964 into main Apr 23, 2024
16 checks passed

jimmidyson deleted the jimmi/crd-based-variables-schema branch April 23, 2024 17:50

github-actions bot mentioned this pull request Apr 23, 2024

release(main): v0.8.0 #527

Merged

dkoshkin mentioned this pull request Apr 25, 2024

refactor: Rename GenericClusterConfig to GenericSpec #443

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: Use separate types for provider cluster configs #537

refactor: Use separate types for provider cluster configs #537

Uh oh!

jimmidyson commented Apr 18, 2024 •

edited

Loading

Uh oh!

dkoshkin left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 22, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dkoshkin left a comment

Uh oh!

Uh oh!

deepakm-ntnx left a comment

Uh oh!

Uh oh!

Uh oh!

refactor: Use separate types for provider cluster configs #537

refactor: Use separate types for provider cluster configs #537

Uh oh!

Conversation

jimmidyson commented Apr 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dkoshkin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 22, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dkoshkin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

deepakm-ntnx left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jimmidyson commented Apr 18, 2024 •

edited

Loading