Add CACertificateValidityPeriod to Kubeadmconfig

Author: Karthik-K-N

api/bootstrap/kubeadm/v1beta1/conversion_test.go

@@ -130,6 +130,7 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 	// Drop the field to avoid round trip errors as it exists only in v1beta2.
 	if in.ClusterConfiguration != nil {
 		in.ClusterConfiguration.CertificateValidityPeriodSeconds = nil
+		in.ClusterConfiguration.CACertificateValidityPeriodSeconds = nil
 	}
 }
 

api/bootstrap/kubeadm/v1beta1/zz_generated.conversion.go

@@ -174,9 +174,14 @@ type ClusterConfiguration struct {
 	FeatureGates map[string]bool `json:"featureGates,omitempty"`
 
 	// certificateValidityPeriodSeconds specifies the validity period for a non-CA certificate generated by kubeadm.
-	// Default value: 756,864,000 seconds, 8760h (365 days * 24 hours = 1 year)
+	// Default value: 756,864,000 seconds -> 8760h (365 days * 24 hours = 1 year)
 	// +optional
 	CertificateValidityPeriodSeconds *int32 `json:"certificateValidityPeriodSeconds,omitempty"`
+
+	// caCertificateValidityPeriodSeconds specifies the validity period for a CA certificate generated by kubeadm.
+	// Default value: 756,864,000 seconds -> 87600h (365 days * 24 hours * 10 = 10 years)
+	// +optional
+	CACertificateValidityPeriodSeconds *int32 `json:"caCertificateValidityPeriodSeconds,omitempty"`
 }
 
 // ControlPlaneComponent holds settings common to control plane component of the cluster.

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -106,6 +106,7 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 	}
 	if in.ClusterConfiguration != nil {
 		in.ClusterConfiguration.CertificateValidityPeriodSeconds = nil
+		in.ClusterConfiguration.CACertificateValidityPeriodSeconds = nil
 	}
 }
 

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

@@ -201,4 +201,5 @@ func hubClusterConfigurationFuzzer(obj *bootstrapv1.ClusterConfiguration, c rand
 	c.FillNoCustom(obj)
 
 	obj.CertificateValidityPeriodSeconds = nil
+	obj.CACertificateValidityPeriodSeconds = nil
 }

api/controlplane/kubeadm/v1beta1/conversion_test.go

@@ -67,6 +67,7 @@ func Convert_upstreamv1beta4_ClusterConfiguration_To_v1beta2_ClusterConfiguratio
 		return err
 	}
 	out.CertificateValidityPeriodSeconds = clusterv1.ConvertToSeconds(in.CertificateValidityPeriod)
+	out.CACertificateValidityPeriodSeconds = clusterv1.ConvertToSeconds(in.CACertificateValidityPeriod)
 	return nil
 }
 
@@ -230,5 +231,6 @@ func Convert_v1beta2_ClusterConfiguration_To_upstreamv1beta4_ClusterConfiguratio
 		return err
 	}
 	out.CertificateValidityPeriod = clusterv1.ConvertFromSeconds(in.CertificateValidityPeriodSeconds)
+	out.CACertificateValidityPeriod = clusterv1.ConvertFromSeconds(in.CACertificateValidityPeriodSeconds)
 	return nil
 }