refactor: move kubeadm config out of GenericNodeSpec

Author: dkoshkin

api/v1alpha1/controlplane_types.go

@@ -26,6 +26,7 @@ type DockerControlPlaneSpec struct {
 
 	GenericControlPlaneSpec `json:",inline"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }
 
@@ -36,6 +37,7 @@ type NutanixControlPlaneSpec struct {
 
 	GenericControlPlaneSpec `json:",inline"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }
 
@@ -46,5 +48,6 @@ type AWSControlPlaneSpec struct {
 
 	GenericControlPlaneSpec `json:",inline"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }

api/v1alpha1/nodeconfig_types.go

@@ -54,6 +54,7 @@ type AWSWorkerNodeConfigSpec struct {
 	// +kubebuilder:validation:Optional
 	AWS *AWSWorkerNodeSpec `json:"aws,omitempty"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }
 
@@ -79,6 +80,7 @@ type DockerWorkerNodeConfigSpec struct {
 	// +kubebuilder:validation:Optional
 	Docker *DockerNodeSpec `json:"docker,omitempty"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }
 
@@ -102,19 +104,22 @@ type NutanixWorkerNodeConfigSpec struct {
 	// +kubebuilder:validation:Optional
 	Nutanix *NutanixWorkerNodeSpec `json:"nutanix,omitempty"`
 
+	KubeadmNodeSpec `json:",inline"`
 	GenericNodeSpec `json:",inline"`
 }
 
+type KubeadmNodeSpec struct {
+	// NodeRegistration holds fields that relate to registering the new control-plane node to the cluster.
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default={}
+	NodeRegistration *NodeRegistrationOptions `json:"nodeRegistration,omitempty"`
+}
+
 type GenericNodeSpec struct {
 	// Taints specifies the taints the Node API object should be registered with.
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:MaxItems=32
 	Taints []Taint `json:"taints,omitempty"`
-
-	// NodeRegistration holds fields that relate to registering the new control-plane node to the cluster.
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={}
-	NodeRegistration *NodeRegistrationOptions `json:"nodeRegistration,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1alpha1/zz_generated.deepcopy.go

@@ -41,6 +41,7 @@ type ControlPlaneSpec struct {
 
 	carenv1.GenericControlPlaneSpec `json:",inline"`
 
+	carenv1.KubeadmNodeSpec `json:",inline"`
 	carenv1.GenericNodeSpec `json:",inline"`
 }
 
@@ -53,6 +54,7 @@ type WorkerNodeConfigSpec struct {
 
 	EKS *carenv1.AWSWorkerNodeSpec `json:"eks,omitempty"`
 
+	carenv1.KubeadmNodeSpec `json:",inline"`
 	carenv1.GenericNodeSpec `json:",inline"`
 }
 

api/variables/aggregate_types.go

@@ -24,7 +24,7 @@ func TestVariableValidation(t *testing.T) {
 			Name: "specified IgnorePreflightErrors",
 			Vals: v1alpha1.NutanixClusterConfigSpec{
 				ControlPlane: &v1alpha1.NutanixControlPlaneSpec{
-					GenericNodeSpec: v1alpha1.GenericNodeSpec{
+					KubeadmNodeSpec: v1alpha1.KubeadmNodeSpec{
 						NodeRegistration: &v1alpha1.NodeRegistrationOptions{
 							IgnorePreflightErrors: []string{"all"},
 						},