Fix review findings

Author: sbueringer

api/v1beta1/cluster_types.go

@@ -555,6 +555,7 @@ type Topology struct {
 	ClassNamespace string `json:"classNamespace,omitempty"`
 
 	// version is the Kubernetes version of the cluster.
+	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=256
 	Version string `json:"version"`
 
@@ -672,6 +673,7 @@ type MachineDeploymentTopology struct {
 	// class is the name of the MachineDeploymentClass used to create the set of worker nodes.
 	// This should match one of the deployment classes defined in the ClusterClass object
 	// mentioned in the `Cluster.Spec.Class` field.
+	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=256
 	Class string `json:"class"`
 
@@ -778,6 +780,7 @@ type MachinePoolTopology struct {
 	// class is the name of the MachinePoolClass used to create the pool of worker nodes.
 	// This should match one of the deployment classes defined in the ClusterClass object
 	// mentioned in the `Cluster.Spec.Class` field.
+	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=256
 	Class string `json:"class"`
 
@@ -960,9 +963,8 @@ type ClusterStatus struct {
 	FailureMessage *string `json:"failureMessage,omitempty"`
 
 	// phase represents the current phase of cluster actuation.
-	// E.g. Pending, Running, Terminating, Failed etc.
 	// +optional
-	// +kubebuilder:validation:MaxLength=50
+	// +kubebuilder:validation:Enum=Pending;Provisioning;Provisioned;Deleting;Failed;Unknown
 	Phase string `json:"phase,omitempty"`
 
 	// infrastructureReady is the state of the infrastructure provider.

api/v1beta1/clusterclass_types.go

@@ -214,7 +214,7 @@ type ControlPlaneClassNamingStrategy struct {
 	// * `.cluster.name`: The name of the cluster object.
 	// * `.random`: A random alphanumeric string, without vowels, of length 5.
 	// +optional
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	Template *string `json:"template,omitempty"`
 }
 
@@ -228,7 +228,7 @@ type InfrastructureNamingStrategy struct {
 	// * `.cluster.name`: The name of the cluster object.
 	// * `.random`: A random alphanumeric string, without vowels, of length 5.
 	// +optional
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	Template *string `json:"template,omitempty"`
 }
 
@@ -354,7 +354,7 @@ type MachineDeploymentClassNamingStrategy struct {
 	// * `.random`: A random alphanumeric string, without vowels, of length 5.
 	// * `.machineDeployment.topologyName`: The name of the MachineDeployment topology (Cluster.spec.topology.workers.machineDeployments[].name).
 	// +optional
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	Template *string `json:"template,omitempty"`
 }
 
@@ -491,7 +491,7 @@ type MachinePoolClassNamingStrategy struct {
 	// * `.random`: A random alphanumeric string, without vowels, of length 5.
 	// * `.machinePool.topologyName`: The name of the MachinePool topology (Cluster.spec.topology.workers.machinePools[].name).
 	// +optional
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	Template *string `json:"template,omitempty"`
 }
 
@@ -568,7 +568,7 @@ type JSONSchemaProps struct {
 	// type is the type of the variable.
 	// Valid values are: object, array, string, integer, number or boolean.
 	// +optional
-	// +kubebuilder:validation:MaxLength=16
+	// +kubebuilder:validation:Enum=object;array;string;integer;number;boolean
 	Type string `json:"type,omitempty"`
 
 	// properties specifies fields of an object.
@@ -824,7 +824,7 @@ type ValidationRule struct {
 	// skipped if an old value could not be found.
 	//
 	// +required
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=4096
 	Rule string `json:"rule"`
 	// message represents the message displayed when validation fails. The message is required if the Rule contains
 	// line breaks. The message must not contain line breaks.
@@ -843,7 +843,7 @@ type ValidationRule struct {
 	// Example:
 	// "x must be less than max ("+string(self.max)+")"
 	// +optional
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	MessageExpression string `json:"messageExpression,omitempty"`
 	// reason provides a machine-readable validation failure reason that is returned to the caller when a request fails this validation rule.
 	// The currently supported reasons are: "FieldValueInvalid", "FieldValueForbidden", "FieldValueRequired", "FieldValueDuplicate".
@@ -894,7 +894,7 @@ type ClusterClassPatch struct {
 	Name string `json:"name"`
 
 	// description is a human-readable description of this patch.
-	// +kubebuilder:validation:MaxLength=512
+	// +kubebuilder:validation:MaxLength=1024
 	Description string `json:"description,omitempty"`
 
 	// enabledIf is a Go template to be used to calculate if a patch should be enabled.
@@ -998,7 +998,7 @@ type PatchSelectorMatchMachinePoolClass struct {
 type JSONPatch struct {
 	// op defines the operation of the patch.
 	// Note: Only `add`, `replace` and `remove` are supported.
-	// +kubebuilder:validation:MaxLength=8
+	// +kubebuilder:validation:Enum=add;replace;remove
 	Op string `json:"op"`
 
 	// path defines the path of the patch.

api/v1beta1/common_types.go

@@ -270,7 +270,7 @@ var (
 )
 
 // MachineAddressType describes a valid MachineAddress type.
-// +kubebuilder:validation:MaxLength=16
+// +kubebuilder:validation:Enum=Hostname;ExternalIP;InternalIP;ExternalDNS;InternalDNS
 type MachineAddressType string
 
 // Define the MachineAddressType constants.

api/v1beta1/condition_types.go

@@ -24,7 +24,7 @@ import (
 // ANCHOR: ConditionSeverity
 
 // ConditionSeverity expresses the severity of a Condition Type failing.
-// +kubebuilder:validation:MaxLength=8
+// +kubebuilder:validation:MaxLength=32
 type ConditionSeverity string
 
 const (
@@ -85,7 +85,7 @@ type Condition struct {
 	// message is a human readable message indicating details about the transition.
 	// This field may be empty.
 	// +optional
-	// +kubebuilder:validation:MaxLength=2048
+	// +kubebuilder:validation:MaxLength=10240
 	Message string `json:"message,omitempty"`
 }
 

api/v1beta1/machine_types.go

@@ -406,7 +406,7 @@ type MachineSpec struct {
 	// This field will be set by the actuators and consumed by higher level entities like autoscaler that will
 	// be interfacing with cluster-api as generic provider.
 	// +optional
-	// +kubebuilder:validation:MaxLength=253
+	// +kubebuilder:validation:MaxLength=512
 	ProviderID *string `json:"providerID,omitempty"`
 
 	// failureDomain is the failure domain the machine will be created in.
@@ -552,9 +552,8 @@ type MachineStatus struct {
 	Addresses MachineAddresses `json:"addresses,omitempty"`
 
 	// phase represents the current phase of machine actuation.
-	// E.g. Pending, Running, Terminating, Failed etc.
 	// +optional
-	// +kubebuilder:validation:MaxLength=50
+	// +kubebuilder:validation:Enum=Pending;Provisioning;Provisioned;Running;Deleting;Deleted;Failed;Unknown
 	Phase string `json:"phase,omitempty"`
 
 	// certificatesExpiryDate is the expiry date of the machine certificates.
@@ -660,6 +659,7 @@ type Bootstrap struct {
 	// dataSecretName is the name of the secret that stores the bootstrap data script.
 	// If nil, the Machine should remain in the Pending state.
 	// +optional
+	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=253
 	DataSecretName *string `json:"dataSecretName,omitempty"`
 }

api/v1beta1/machinedeployment_types.go

@@ -490,7 +490,7 @@ type MachineDeploymentStatus struct {
 
 	// phase represents the current phase of a MachineDeployment (ScalingUp, ScalingDown, Running, Failed, or Unknown).
 	// +optional
-	// +kubebuilder:validation:MaxLength=50
+	// +kubebuilder:validation:Enum=ScalingUp;ScalingDown;Running;Failed;Unknown
 	Phase string `json:"phase,omitempty"`
 
 	// conditions defines current service state of the MachineDeployment.

api/v1beta1/zz_generated.openapi.go

@@ -182,7 +182,7 @@ type APIServer struct {
 	// certSANs sets extra Subject Alternative Names for the API Server signing cert.
 	// +optional
 	// +kubebuilder:validation:MaxItems=100
-	// +kubebuilder:validation:items:MaxLength=512
+	// +kubebuilder:validation:items:MaxLength=253
 	CertSANs []string `json:"certSANs,omitempty"`
 
 	// timeoutForControlPlane controls the timeout that we use for API server to appear
@@ -284,7 +284,6 @@ type NodeRegistrationOptions struct {
 	// with Kubernetes version equal to 1.22 and later.
 	// +kubebuilder:validation:Enum=Always;IfNotPresent;Never
 	// +optional
-	// +kubebuilder:validation:MaxLength=16
 	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
 
 	// imagePullSerial specifies if image pulling performed by kubeadm must be done serially or in parallel.
@@ -437,13 +436,13 @@ type LocalEtcd struct {
 	// serverCertSANs sets extra Subject Alternative Names for the etcd server signing cert.
 	// +optional
 	// +kubebuilder:validation:MaxItems=100
-	// +kubebuilder:validation:items:MaxLength=512
+	// +kubebuilder:validation:items:MaxLength=253
 	ServerCertSANs []string `json:"serverCertSANs,omitempty"`
 
 	// peerCertSANs sets extra Subject Alternative Names for the etcd peer signing cert.
 	// +optional
 	// +kubebuilder:validation:MaxItems=100
-	// +kubebuilder:validation:items:MaxLength=512
+	// +kubebuilder:validation:items:MaxLength=253
 	PeerCertSANs []string `json:"peerCertSANs,omitempty"`
 }
 
@@ -635,7 +634,7 @@ type KubeConfigCluster struct {
 	// Defaults to the Cluster's CA certificate if empty.
 	//
 	// +optional
-	// +kubebuilder:validation:MaxLength=4096
+	// +kubebuilder:validation:MaxLength=51200
 	CertificateAuthorityData []byte `json:"certificateAuthorityData,omitempty"`
 
 	// proxyURL is the URL to the proxy to be used for all requests made by this

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go

@@ -732,7 +732,7 @@ type Partition struct {
 	// 'mbr': default and setups a MS-DOS partition table
 	// 'gpt': setups a GPT partition table
 	// +optional
-	// +kubebuilder:validation:MaxLength=3
+	// +kubebuilder:validation:Enum=mbr;gpt
 	TableType *string `json:"tableType,omitempty"`
 }