Merge pull request #12550 from fabriziopandini/omitzero-struct

k8s-ci-robot · web-flow · commit 3a4074421425 · 2025-07-30T12:20:27.000-07:00
⚠️ Add omitzero on struct without zero value
diff --git a/api/bootstrap/kubeadm/v1beta2/kubeadm_types.go b/api/bootstrap/kubeadm/v1beta2/kubeadm_types.go
@@ -710,7 +710,7 @@ type FileDiscoveryKubeConfig struct {
 	// user contains information that describes identity information.
 	// This is used to tell the kubernetes cluster who you are.
 	// +required
-	User KubeConfigUser `json:"user"`
+	User KubeConfigUser `json:"user,omitempty,omitzero"`
 }
 
 // KubeConfigCluster contains information about how to communicate with a kubernetes cluster.
diff --git a/api/bootstrap/kubeadm/v1beta2/kubeadmconfig_types.go b/api/bootstrap/kubeadm/v1beta2/kubeadmconfig_types.go
@@ -650,7 +650,7 @@ type File struct {
 type FileSource struct {
 	// secret represents a secret that should populate this file.
 	// +required
-	Secret SecretFileSource `json:"secret"`
+	Secret SecretFileSource `json:"secret,omitempty,omitzero"`
 }
 
 // SecretFileSource adapts a Secret into a FileSource.
@@ -677,7 +677,7 @@ type SecretFileSource struct {
 type PasswdSource struct {
 	// secret represents a secret that should populate this password.
 	// +required
-	Secret SecretPasswdSource `json:"secret"`
+	Secret SecretPasswdSource `json:"secret,omitempty,omitzero"`
 }
 
 // SecretPasswdSource adapts a Secret into a PasswdSource.
diff --git a/api/bootstrap/kubeadm/v1beta2/kubeadmconfigtemplate_types.go b/api/bootstrap/kubeadm/v1beta2/kubeadmconfigtemplate_types.go
@@ -26,7 +26,7 @@ import (
 type KubeadmConfigTemplateSpec struct {
 	// template defines the desired state of KubeadmConfigTemplate.
 	// +required
-	Template KubeadmConfigTemplateResource `json:"template"`
+	Template KubeadmConfigTemplateResource `json:"template,omitempty,omitzero"`
 }
 
 // KubeadmConfigTemplateResource defines the Template structure.
diff --git a/api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go b/api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go
@@ -437,7 +437,7 @@ type KubeadmControlPlaneSpec struct {
 	// machineTemplate contains information about how machines
 	// should be shaped when creating or updating a control plane.
 	// +required
-	MachineTemplate KubeadmControlPlaneMachineTemplate `json:"machineTemplate"`
+	MachineTemplate KubeadmControlPlaneMachineTemplate `json:"machineTemplate,omitempty,omitzero"`
 
 	// kubeadmConfigSpec is a KubeadmConfigSpec
 	// to use for initializing and joining machines to the control plane.
@@ -480,7 +480,7 @@ type KubeadmControlPlaneMachineTemplateSpec struct {
 	// infrastructureRef is a required reference to a custom resource
 	// offered by an infrastructure provider.
 	// +required
-	InfrastructureRef clusterv1.ContractVersionedObjectReference `json:"infrastructureRef"`
+	InfrastructureRef clusterv1.ContractVersionedObjectReference `json:"infrastructureRef,omitempty,omitzero"`
 
 	// readinessGates specifies additional conditions to include when evaluating Machine Ready condition;
 	// KubeadmControlPlane will always add readinessGates for the condition it is setting on the Machine:
diff --git a/api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go b/api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go
@@ -27,7 +27,7 @@ import (
 type KubeadmControlPlaneTemplateSpec struct {
 	// template defines the desired state of KubeadmControlPlaneTemplate.
 	// +required
-	Template KubeadmControlPlaneTemplateResource `json:"template"`
+	Template KubeadmControlPlaneTemplateResource `json:"template,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true
diff --git a/api/core/v1beta2/cluster_types.go b/api/core/v1beta2/cluster_types.go
@@ -540,7 +540,7 @@ type ClusterAvailabilityGate struct {
 type Topology struct {
 	// classRef is the ref to the ClusterClass that should be used for the topology.
 	// +required
-	ClassRef ClusterClassRef `json:"classRef"`
+	ClassRef ClusterClassRef `json:"classRef,omitempty,omitzero"`
 
 	// version is the Kubernetes version of the cluster.
 	// +required
diff --git a/api/core/v1beta2/clusterclass_types.go b/api/core/v1beta2/clusterclass_types.go
@@ -409,12 +409,12 @@ type MachineDeploymentClass struct {
 	// bootstrap contains the bootstrap template reference to be used
 	// for the creation of worker Machines.
 	// +required
-	Bootstrap MachineDeploymentClassBootstrapTemplate `json:"bootstrap"`
+	Bootstrap MachineDeploymentClassBootstrapTemplate `json:"bootstrap,omitempty,omitzero"`
 
 	// infrastructure contains the infrastructure template reference to be used
 	// for the creation of worker Machines.
 	// +required
-	Infrastructure MachineDeploymentClassInfrastructureTemplate `json:"infrastructure"`
+	Infrastructure MachineDeploymentClassInfrastructureTemplate `json:"infrastructure,omitempty,omitzero"`
 
 	// healthCheck defines a MachineHealthCheck for this MachineDeploymentClass.
 	// +optional
@@ -714,12 +714,12 @@ type MachinePoolClass struct {
 	// bootstrap contains the bootstrap template reference to be used
 	// for the creation of the Machines in the MachinePool.
 	// +required
-	Bootstrap MachinePoolClassBootstrapTemplate `json:"bootstrap"`
+	Bootstrap MachinePoolClassBootstrapTemplate `json:"bootstrap,omitempty,omitzero"`
 
 	// infrastructure contains the infrastructure template reference to be used
 	// for the creation of the MachinePool.
 	// +required
-	Infrastructure MachinePoolClassInfrastructureTemplate `json:"infrastructure"`
+	Infrastructure MachinePoolClassInfrastructureTemplate `json:"infrastructure,omitempty,omitzero"`
 
 	// failureDomains is the list of failure domains the MachinePool should be attached to.
 	// Must match a key in the FailureDomains map stored on the cluster object.
@@ -820,7 +820,7 @@ type ClusterClassVariable struct {
 
 	// schema defines the schema of the variable.
 	// +required
-	Schema VariableSchema `json:"schema"`
+	Schema VariableSchema `json:"schema,omitempty,omitzero"`
 }
 
 // ClusterClassVariableMetadata is the metadata of a variable.
@@ -848,7 +848,7 @@ type VariableSchema struct {
 	// schema. The schema is a subset of the schema used in
 	// Kubernetes CRDs.
 	// +required
-	OpenAPIV3Schema JSONSchemaProps `json:"openAPIV3Schema"`
+	OpenAPIV3Schema JSONSchemaProps `json:"openAPIV3Schema,omitempty,omitzero"`
 }
 
 // Adapted from https://github.com/kubernetes/apiextensions-apiserver/blob/v0.28.5/pkg/apis/apiextensions/v1/types_jsonschema.go#L40
@@ -1244,15 +1244,16 @@ type ClusterClassPatch struct {
 type PatchDefinition struct {
 	// selector defines on which templates the patch should be applied.
 	// +required
-	Selector PatchSelector `json:"selector"`
+	Selector PatchSelector `json:"selector,omitempty,omitzero"`
 
 	// jsonPatches defines the patches which should be applied on the templates
 	// matching the selector.
 	// Note: Patches will be applied in the order of the array.
+	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=100
 	// +required
 	// +listType=atomic
-	JSONPatches []JSONPatch `json:"jsonPatches"`
+	JSONPatches []JSONPatch `json:"jsonPatches,omitempty"`
 }
 
 // PatchSelector defines on which templates the patch should be applied.
@@ -1586,7 +1587,7 @@ type ClusterClassStatusVariableDefinition struct {
 
 	// schema defines the schema of the variable.
 	// +required
-	Schema VariableSchema `json:"schema"`
+	Schema VariableSchema `json:"schema,omitempty,omitzero"`
 }
 
 // GetV1Beta1Conditions returns the set of conditions for this object.
diff --git a/api/core/v1beta2/machine_types.go b/api/core/v1beta2/machine_types.go
@@ -391,7 +391,7 @@ type MachineSpec struct {
 	// infrastructureRef is a required reference to a custom resource
 	// offered by an infrastructure provider.
 	// +required
-	InfrastructureRef ContractVersionedObjectReference `json:"infrastructureRef"`
+	InfrastructureRef ContractVersionedObjectReference `json:"infrastructureRef,omitempty,omitzero"`
 
 	// version defines the desired Kubernetes version.
 	// This field is meant to be optionally used by bootstrap providers.
diff --git a/api/core/v1beta2/machinedeployment_types.go b/api/core/v1beta2/machinedeployment_types.go
@@ -274,7 +274,7 @@ type MachineDeploymentSpec struct {
 
 	// template describes the machines that will be created.
 	// +required
-	Template MachineTemplateSpec `json:"template"`
+	Template MachineTemplateSpec `json:"template,omitempty,omitzero"`
 
 	// machineNaming allows changing the naming pattern used when creating Machines.
 	// Note: InfraMachines & BootstrapConfigs will use the same name as the corresponding Machines.
diff --git a/api/core/v1beta2/machinedrainrules_types.go b/api/core/v1beta2/machinedrainrules_types.go
@@ -47,7 +47,7 @@ const (
 type MachineDrainRuleSpec struct {
 	// drain configures if and how Pods are drained.
 	// +required
-	Drain MachineDrainRuleDrainConfig `json:"drain"`
+	Drain MachineDrainRuleDrainConfig `json:"drain,omitempty,omitzero"`
 
 	// machines defines to which Machines this MachineDrainRule should be applied.
 	//
@@ -212,7 +212,7 @@ type MachineDrainRule struct {
 
 	// spec defines the spec of a MachineDrainRule.
 	// +required
-	Spec MachineDrainRuleSpec `json:"spec"`
+	Spec MachineDrainRuleSpec `json:"spec,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true
diff --git a/api/core/v1beta2/machinepool_types.go b/api/core/v1beta2/machinepool_types.go
@@ -79,7 +79,7 @@ type MachinePoolSpec struct {
 
 	// template describes the machines that will be created.
 	// +required
-	Template MachineTemplateSpec `json:"template"`
+	Template MachineTemplateSpec `json:"template,omitempty,omitzero"`
 
 	// providerIDList are the identification IDs of machine instances provided by the provider.
 	// This field must match the provider IDs as seen on the node objects corresponding to a machine pool's machine instances.
diff --git a/api/core/v1beta2/machineset_types.go b/api/core/v1beta2/machineset_types.go
@@ -74,7 +74,7 @@ type MachineSetSpec struct {
 	// insufficient replicas are detected.
 	// Object references to custom resources are treated as templates.
 	// +required
-	Template MachineTemplateSpec `json:"template"`
+	Template MachineTemplateSpec `json:"template,omitempty,omitzero"`
 
 	// machineNaming allows changing the naming pattern used when creating Machines.
 	// Note: InfraMachines & BootstrapConfigs will use the same name as the corresponding Machines.
@@ -243,7 +243,7 @@ type MachineTemplateSpec struct {
 	// spec is the specification of the desired behavior of the machine.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
 	// +required
-	Spec MachineSpec `json:"spec"`
+	Spec MachineSpec `json:"spec,omitempty,omitzero"`
 }
 
 // MachineSetDeletionOrder defines how priority is assigned to nodes to delete when
diff --git a/api/ipam/v1beta2/ipaddress_types.go b/api/ipam/v1beta2/ipaddress_types.go
@@ -24,11 +24,11 @@ import (
 type IPAddressSpec struct {
 	// claimRef is a reference to the claim this IPAddress was created for.
 	// +required
-	ClaimRef IPAddressClaimReference `json:"claimRef"`
+	ClaimRef IPAddressClaimReference `json:"claimRef,omitempty,omitzero"`
 
 	// poolRef is a reference to the pool that this IPAddress was created from.
 	// +required
-	PoolRef IPPoolReference `json:"poolRef"`
+	PoolRef IPPoolReference `json:"poolRef,omitempty,omitzero"`
 
 	// address is the IP address.
 	// +required
diff --git a/api/ipam/v1beta2/ipaddressclaim_types.go b/api/ipam/v1beta2/ipaddressclaim_types.go
@@ -50,7 +50,7 @@ type IPAddressClaimSpec struct {
 
 	// poolRef is a reference to the pool from which an IP address should be created.
 	// +required
-	PoolRef IPPoolReference `json:"poolRef"`
+	PoolRef IPPoolReference `json:"poolRef,omitempty,omitzero"`
 }
 
 // IPAddressClaimStatus is the observed status of a IPAddressClaim.
diff --git a/api/runtime/v1beta2/extensionconfig_types.go b/api/runtime/v1beta2/extensionconfig_types.go
@@ -26,7 +26,7 @@ import (
 type ExtensionConfigSpec struct {
 	// clientConfig defines how to communicate with the Extension server.
 	// +required
-	ClientConfig ClientConfig `json:"clientConfig"`
+	ClientConfig ClientConfig `json:"clientConfig,omitempty,omitzero"`
 
 	// namespaceSelector decides whether to call the hook for an object based
 	// on whether the namespace for that object matches the selector.
@@ -163,7 +163,7 @@ type ExtensionHandler struct {
 
 	// requestHook defines the versioned runtime hook which this ExtensionHandler serves.
 	// +required
-	RequestHook GroupVersionHook `json:"requestHook"`
+	RequestHook GroupVersionHook `json:"requestHook,omitempty,omitzero"`
 
 	// timeoutSeconds defines the timeout duration for client calls to the ExtensionHandler.
 	// Defaults to 10 if not set.
diff --git a/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml b/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ type FileDiscoveryKubeConfig struct {`
`710`	`710`	`// user contains information that describes identity information.`
`711`	`711`	`// This is used to tell the kubernetes cluster who you are.`
`712`	`712`	`// +required`
`713`		- User KubeConfigUser `json:"user"`
	`713`	+ User KubeConfigUser `json:"user,omitempty,omitzero"`
`714`	`714`	`}`
`715`	`715`
`716`	`716`	`// KubeConfigCluster contains information about how to communicate with a kubernetes cluster.`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`type KubeadmConfigTemplateSpec struct {`
`27`	`27`	`// template defines the desired state of KubeadmConfigTemplate.`
`28`	`28`	`// +required`
`29`		- Template KubeadmConfigTemplateResource `json:"template"`
	`29`	+ Template KubeadmConfigTemplateResource `json:"template,omitempty,omitzero"`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// KubeadmConfigTemplateResource defines the Template structure.`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`type KubeadmControlPlaneTemplateSpec struct {`
`28`	`28`	`// template defines the desired state of KubeadmControlPlaneTemplate.`
`29`	`29`	`// +required`
`30`		- Template KubeadmControlPlaneTemplateResource `json:"template"`
	`30`	+ Template KubeadmControlPlaneTemplateResource `json:"template,omitempty,omitzero"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// +kubebuilder:object:root=true`