Align Spec fields to optionalfields API conventions

Author: sbueringer

api/addons/v1beta2/clusterresourceset_types.go

@@ -203,8 +203,8 @@ type ClusterResourceSet struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of ClusterResourceSet.
-	// +optional
-	Spec ClusterResourceSetSpec `json:"spec,omitempty"`
+	// +required
+	Spec ClusterResourceSetSpec `json:"spec"`
 	// status is the observed state of ClusterResourceSet.
 	// +optional
 	Status ClusterResourceSetStatus `json:"status,omitempty"`

api/addons/v1beta2/clusterresourcesetbinding_types.go

@@ -127,8 +127,8 @@ type ClusterResourceSetBinding struct {
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 	// spec is the desired state of ClusterResourceSetBinding.
-	// +optional
-	Spec ClusterResourceSetBindingSpec `json:"spec,omitempty"`
+	// +required
+	Spec ClusterResourceSetBindingSpec `json:"spec"`
 }
 
 // ANCHOR: ClusterResourceSetBindingSpec

api/bootstrap/kubeadm/v1beta2/kubeadmconfig_types.go

@@ -50,6 +50,7 @@ var (
 
 // KubeadmConfigSpec defines the desired state of KubeadmConfig.
 // Either ClusterConfiguration and InitConfiguration should be defined or the JoinConfiguration should be defined.
+// +kubebuilder:validation:MinProperties=1
 type KubeadmConfigSpec struct {
 	// clusterConfiguration along with InitConfiguration are the configurations necessary for the init command
 	// +optional
@@ -541,8 +542,8 @@ type KubeadmConfig struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of KubeadmConfig.
-	// +optional
-	Spec KubeadmConfigSpec `json:"spec,omitempty"`
+	// +required
+	Spec KubeadmConfigSpec `json:"spec"`
 	// status is the observed state of KubeadmConfig.
 	// +optional
 	Status KubeadmConfigStatus `json:"status,omitempty"`

api/bootstrap/kubeadm/v1beta2/kubeadmconfigtemplate_types.go

@@ -23,13 +23,15 @@ import (
 )
 
 // KubeadmConfigTemplateSpec defines the desired state of KubeadmConfigTemplate.
+// +kubebuilder:validation:MinProperties=1
 type KubeadmConfigTemplateSpec struct {
 	// template defines the desired state of KubeadmConfigTemplate.
 	// +required
 	Template KubeadmConfigTemplateResource `json:"template"`
 }
 
 // KubeadmConfigTemplateResource defines the Template structure.
+// +kubebuilder:validation:MinProperties=1
 type KubeadmConfigTemplateResource struct {
 	// metadata is the standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
@@ -38,7 +40,7 @@ type KubeadmConfigTemplateResource struct {
 
 	// spec is the desired state of KubeadmConfig.
 	// +optional
-	Spec KubeadmConfigSpec `json:"spec,omitempty"`
+	Spec KubeadmConfigSpec `json:"spec,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true
@@ -56,7 +58,7 @@ type KubeadmConfigTemplate struct {
 
 	// spec is the desired state of KubeadmConfigTemplate.
 	// +optional
-	Spec KubeadmConfigTemplateSpec `json:"spec,omitempty"`
+	Spec KubeadmConfigTemplateSpec `json:"spec,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true

api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

@@ -806,8 +806,8 @@ type KubeadmControlPlane struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of KubeadmControlPlane.
-	// +optional
-	Spec KubeadmControlPlaneSpec `json:"spec,omitempty"`
+	// +required
+	Spec KubeadmControlPlaneSpec `json:"spec"`
 	// status is the observed state of KubeadmControlPlane.
 	// +optional
 	Status KubeadmControlPlaneStatus `json:"status,omitempty"`

api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go

@@ -24,6 +24,7 @@ import (
 )
 
 // KubeadmControlPlaneTemplateSpec defines the desired state of KubeadmControlPlaneTemplate.
+// +kubebuilder:validation:MinProperties=1
 type KubeadmControlPlaneTemplateSpec struct {
 	// template defines the desired state of KubeadmControlPlaneTemplate.
 	// +required
@@ -46,7 +47,7 @@ type KubeadmControlPlaneTemplate struct {
 
 	// spec is the desired state of KubeadmControlPlaneTemplate.
 	// +optional
-	Spec KubeadmControlPlaneTemplateSpec `json:"spec,omitempty"`
+	Spec KubeadmControlPlaneTemplateSpec `json:"spec,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true
@@ -67,15 +68,16 @@ func init() {
 }
 
 // KubeadmControlPlaneTemplateResource describes the data needed to create a KubeadmControlPlane from a template.
+// +kubebuilder:validation:MinProperties=1
 type KubeadmControlPlaneTemplateResource struct {
 	// metadata is the standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
 	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of KubeadmControlPlaneTemplateResource.
-	// +required
-	Spec KubeadmControlPlaneTemplateResourceSpec `json:"spec"`
+	// +optional
+	Spec KubeadmControlPlaneTemplateResourceSpec `json:"spec,omitempty,omitzero"`
 }
 
 // KubeadmControlPlaneTemplateResourceSpec defines the desired state of KubeadmControlPlane.
@@ -91,8 +93,8 @@ type KubeadmControlPlaneTemplateResourceSpec struct {
 
 	// kubeadmConfigSpec is a KubeadmConfigSpec
 	// to use for initializing and joining machines to the control plane.
-	// +required
-	KubeadmConfigSpec bootstrapv1.KubeadmConfigSpec `json:"kubeadmConfigSpec"`
+	// +optional
+	KubeadmConfigSpec bootstrapv1.KubeadmConfigSpec `json:"kubeadmConfigSpec,omitempty,omitzero"`
 
 	// rolloutBefore is a field to indicate a rollout should be performed
 	// if the specified criteria is met.

api/core/v1beta2/cluster_types.go

@@ -458,6 +458,7 @@ const (
 // ANCHOR: ClusterSpec
 
 // ClusterSpec defines the desired state of Cluster.
+// +kubebuilder:validation:MinProperties=1
 type ClusterSpec struct {
 	// paused can be used to prevent controllers from processing the Cluster and all its associated objects.
 	// +optional
@@ -1184,8 +1185,8 @@ type Cluster struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of Cluster.
-	// +optional
-	Spec ClusterSpec `json:"spec,omitempty"`
+	// +required
+	Spec ClusterSpec `json:"spec"`
 	// status is the observed state of Cluster.
 	// +optional
 	Status ClusterStatus `json:"status,omitempty"`

api/core/v1beta2/clusterclass_types.go

@@ -81,14 +81,15 @@ type ClusterClass struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of ClusterClass.
-	// +optional
-	Spec ClusterClassSpec `json:"spec,omitempty"`
+	// +required
+	Spec ClusterClassSpec `json:"spec"`
 	// status is the observed state of ClusterClass.
 	// +optional
 	Status ClusterClassStatus `json:"status,omitempty"`
 }
 
 // ClusterClassSpec describes the desired state of the ClusterClass.
+// +kubebuilder:validation:MinProperties=1
 type ClusterClassSpec struct {
 	// availabilityGates specifies additional conditions to include when evaluating Cluster Available condition.
 	//

api/core/v1beta2/machine_types.go

@@ -735,8 +735,8 @@ type Machine struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of Machine.
-	// +optional
-	Spec MachineSpec `json:"spec,omitempty"`
+	// +required
+	Spec MachineSpec `json:"spec"`
 	// status is the observed state of Machine.
 	// +optional
 	Status MachineStatus `json:"status,omitempty"`

api/core/v1beta2/machinedeployment_types.go

@@ -592,8 +592,8 @@ type MachineDeployment struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec is the desired state of MachineDeployment.
-	// +optional
-	Spec MachineDeploymentSpec `json:"spec,omitempty"`
+	// +required
+	Spec MachineDeploymentSpec `json:"spec"`
 	// status is the observed state of MachineDeployment.
 	// +optional
 	Status MachineDeploymentStatus `json:"status,omitempty"`