Change data type from *int32 to int32

Author: Karthik-K-N

api/bootstrap/kubeadm/v1beta1/conversion.go

@@ -84,14 +84,14 @@ func RestoreKubeadmConfigSpec(restored *bootstrapv1.KubeadmConfigSpec, dst *boot
 		dst.JoinConfiguration.Timeouts = restored.JoinConfiguration.Timeouts
 	}
 	if restored.ClusterConfiguration != nil &&
-		(restored.ClusterConfiguration.CertificateValidityPeriodDays != nil || restored.ClusterConfiguration.CACertificateValidityPeriodDays != nil) {
+		(restored.ClusterConfiguration.CertificateValidityPeriodDays != 0 || restored.ClusterConfiguration.CACertificateValidityPeriodDays != 0) {
 		if dst.ClusterConfiguration == nil {
 			dst.ClusterConfiguration = &bootstrapv1.ClusterConfiguration{}
 		}
-		if restored.ClusterConfiguration.CertificateValidityPeriodDays != nil {
+		if restored.ClusterConfiguration.CertificateValidityPeriodDays != 0 {
 			dst.ClusterConfiguration.CertificateValidityPeriodDays = restored.ClusterConfiguration.CertificateValidityPeriodDays
 		}
-		if restored.ClusterConfiguration.CACertificateValidityPeriodDays != nil {
+		if restored.ClusterConfiguration.CACertificateValidityPeriodDays != 0 {
 			dst.ClusterConfiguration.CACertificateValidityPeriodDays = restored.ClusterConfiguration.CACertificateValidityPeriodDays
 		}
 	}

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -184,12 +184,16 @@ type ClusterConfiguration struct {
 	// certificateValidityPeriodDays specifies the validity period for a non-CA certificate generated by kubeadm.
 	// If not specified, kubeadm will use a default of 3650 days (10 years).
 	// +optional
-	CertificateValidityPeriodDays *int32 `json:"certificateValidityPeriodDays,omitempty"`
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=10950
+	CertificateValidityPeriodDays int32 `json:"certificateValidityPeriodDays,omitempty"`
 
 	// caCertificateValidityPeriodDays specifies the validity period for a CA certificate generated by kubeadm.
 	// If not specified, kubeadm will use a default of 3650 days (10 years).
 	// +optional
-	CACertificateValidityPeriodDays *int32 `json:"caCertificateValidityPeriodDays,omitempty"`
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=10950
+	CACertificateValidityPeriodDays int32 `json:"caCertificateValidityPeriodDays,omitempty"`
 }
 
 // APIServer holds settings necessary for API server deployments in the cluster.

api/bootstrap/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -123,8 +123,8 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 		in.JoinConfiguration.Timeouts.ControlPlaneComponentHealthCheckSeconds = initControlPlaneComponentHealthCheckSeconds
 	}
 	if in.ClusterConfiguration != nil {
-		in.ClusterConfiguration.CertificateValidityPeriodDays = nil
-		in.ClusterConfiguration.CACertificateValidityPeriodDays = nil
+		in.ClusterConfiguration.CertificateValidityPeriodDays = 0
+		in.ClusterConfiguration.CACertificateValidityPeriodDays = 0
 	}
 }
 

api/controlplane/kubeadm/v1beta1/conversion_test.go

@@ -232,6 +232,6 @@ func hubBootstrapTokenDiscoveryFuzzer(obj *bootstrapv1.BootstrapTokenDiscovery,
 func hubClusterConfigurationFuzzer(obj *bootstrapv1.ClusterConfiguration, c randfill.Continue) {
 	c.FillNoCustom(obj)
 
-	obj.CertificateValidityPeriodDays = nil
-	obj.CACertificateValidityPeriodDays = nil
+	obj.CertificateValidityPeriodDays = 0
+	obj.CACertificateValidityPeriodDays = 0
 }

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

@@ -323,22 +323,22 @@ func (src *ClusterConfiguration) GetAdditionalData(data *upstream.AdditionalData
 // convertToDays takes *metav1.Duration and returns a *int32.
 // Durations longer than MaxInt32 are capped.
 // NOTE: this is a util function intended only for usage in API conversions.
-func convertToDays(in *metav1.Duration) *int32 {
+func convertToDays(in *metav1.Duration) int32 {
 	if in == nil {
-		return nil
+		return 0
 	}
 	days := math.Trunc(in.Hours() / 24)
 	if days > math.MaxInt32 {
-		return ptr.To[int32](math.MaxInt32)
+		return math.MaxInt32
 	}
-	return ptr.To(int32(days))
+	return int32(days)
 }
 
 // convertFromDays takes *int32 and returns a *metav1.Duration.
 // NOTE: this is a util function intended only for usage in API conversions.
-func convertFromDays(in *int32) *metav1.Duration {
-	if in == nil {
+func convertFromDays(in int32) *metav1.Duration {
+	if in == 0 {
 		return nil
 	}
-	return ptr.To(metav1.Duration{Duration: time.Duration(*in) * time.Hour * 24})
+	return ptr.To(metav1.Duration{Duration: time.Duration(in) * time.Hour * 24})
 }

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

@@ -101,12 +101,8 @@ func spokeClusterConfigurationFuzzer(obj *ClusterConfiguration, c randfill.Conti
 	obj.Proxy = Proxy{}
 	obj.EncryptionAlgorithm = ""
 
-	if obj.CertificateValidityPeriod != nil {
-		obj.CertificateValidityPeriod = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()%24) * time.Hour * 24})
-	}
-	if obj.CACertificateValidityPeriod != nil {
-		obj.CACertificateValidityPeriod = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()%24) * time.Hour * 24})
-	}
+	obj.CertificateValidityPeriod = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()%24+1) * time.Hour * 24})
+	obj.CACertificateValidityPeriod = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()%24+1) * time.Hour * 24})
 
 	// Drop the following fields as they have been removed in v1beta2, so we don't have to preserve them.
 	obj.Networking.ServiceSubnet = ""
@@ -219,11 +215,6 @@ func hubNodeRegistrationOptionsFuzzer(obj *bootstrapv1.NodeRegistrationOptions,
 func hubClusterConfigurationFuzzer(obj *bootstrapv1.ClusterConfiguration, c randfill.Continue) {
 	c.FillNoCustom(obj)
 
-	if obj.CertificateValidityPeriodDays != nil {
-		obj.CertificateValidityPeriodDays = ptr.To[int32](*obj.CertificateValidityPeriodDays % 24)
-	}
-
-	if obj.CACertificateValidityPeriodDays != nil {
-		obj.CACertificateValidityPeriodDays = ptr.To[int32](*obj.CACertificateValidityPeriodDays % 24)
-	}
+	obj.CertificateValidityPeriodDays %= 24
+	obj.CACertificateValidityPeriodDays %= 24
 }