add kubeadm v1beta4 types

Makefile

@@ -492,12 +492,13 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./internal/apis/bootstrap/kubeadm/v1alpha3 \
 		./internal/apis/bootstrap/kubeadm/v1alpha4
-	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3"
+	$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3,./bootstrap/kubeadm/types/upstreamv1beta4"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./bootstrap/kubeadm/types/upstreamv1beta2 \
-		./bootstrap/kubeadm/types/upstreamv1beta3
+		./bootstrap/kubeadm/types/upstreamv1beta3 \
+		./bootstrap/kubeadm/types/upstreamv1beta4
 
 .PHONY: generate-go-conversions-kubeadm-control-plane
 generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane

bootstrap/kubeadm/types/upstreamv1beta1/conversion.go

@@ -23,75 +23,75 @@ import (
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 )
 
-// ConvertTo converts this ClusterConfiguration to the Hub version (v1alpha4).
+// ConvertTo converts this ClusterConfiguration to the Hub version (CAPBK v1beta1 ).
 func (src *ClusterConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*bootstrapv1.ClusterConfiguration)
 	return Convert_upstreamv1beta1_ClusterConfiguration_To_v1beta1_ClusterConfiguration(src, dst, nil)
 }
 
-// ConvertFrom converts from the ClusterConfiguration Hub version (v1alpha4) to this version.
+// ConvertFrom converts from the ClusterConfiguration Hub version (CAPBK v1beta1 ) to this version.
 func (dst *ClusterConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*bootstrapv1.ClusterConfiguration)
 	return Convert_v1beta1_ClusterConfiguration_To_upstreamv1beta1_ClusterConfiguration(src, dst, nil)
 }
 
-// ConvertTo converts this ClusterStatus to the Hub version (v1alpha4).
+// ConvertTo converts this ClusterStatus to the Hub version (CAPBK v1beta1 ).
 func (src *ClusterStatus) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*bootstrapv1.ClusterStatus)
 	return Convert_upstreamv1beta1_ClusterStatus_To_v1beta1_ClusterStatus(src, dst, nil)
 }
 
-// ConvertFrom converts from the ClusterStatus Hub version (v1alpha4) to this version.
+// ConvertFrom converts from the ClusterStatus Hub version (CAPBK v1beta1 ) to this version.
 func (dst *ClusterStatus) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*bootstrapv1.ClusterStatus)
 	return Convert_v1beta1_ClusterStatus_To_upstreamv1beta1_ClusterStatus(src, dst, nil)
 }
 
-// ConvertTo converts this InitConfiguration to the Hub version (v1alpha4).
+// ConvertTo converts this InitConfiguration to the Hub version (CAPBK v1beta1 ).
 func (src *InitConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*bootstrapv1.InitConfiguration)
 	return Convert_upstreamv1beta1_InitConfiguration_To_v1beta1_InitConfiguration(src, dst, nil)
 }
 
-// ConvertFrom converts from the InitConfiguration Hub version (v1alpha4) to this version.
+// ConvertFrom converts from the InitConfiguration Hub version (CAPBK v1beta1 ) to this version.
 func (dst *InitConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*bootstrapv1.InitConfiguration)
 	return Convert_v1beta1_InitConfiguration_To_upstreamv1beta1_InitConfiguration(src, dst, nil)
 }
 
-// ConvertTo converts this JoinConfiguration to the Hub version (v1alpha4).
+// ConvertTo converts this JoinConfiguration to the Hub version (CAPBK v1beta1 ).
 func (src *JoinConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*bootstrapv1.JoinConfiguration)
 	return Convert_upstreamv1beta1_JoinConfiguration_To_v1beta1_JoinConfiguration(src, dst, nil)
 }
 
-// ConvertFrom converts from the JoinConfiguration Hub version (v1alpha4) to this version.
+// ConvertFrom converts from the JoinConfiguration Hub version (CAPBK v1beta1 ) to this version.
 func (dst *JoinConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*bootstrapv1.JoinConfiguration)
 	return Convert_v1beta1_JoinConfiguration_To_upstreamv1beta1_JoinConfiguration(src, dst, nil)
 }
 
 func Convert_upstreamv1beta1_DNS_To_v1beta1_DNS(in *DNS, out *bootstrapv1.DNS, s apimachineryconversion.Scope) error {
-	// DNS.Type was removed in v1alpha4 because only CoreDNS is supported, dropping this info.
+	// DNS.Type was removed in CABPK v1alpha4 because only CoreDNS is supported, dropping this info.
 	return autoConvert_upstreamv1beta1_DNS_To_v1beta1_DNS(in, out, s)
 }
 
 func Convert_upstreamv1beta1_ClusterConfiguration_To_v1beta1_ClusterConfiguration(in *ClusterConfiguration, out *bootstrapv1.ClusterConfiguration, s apimachineryconversion.Scope) error {
-	// ClusterConfiguration.UseHyperKubeImage was removed in kubeadm v1alpha4 API
+	// ClusterConfiguration.UseHyperKubeImage was removed in CABPK v1alpha4 API
 	return autoConvert_upstreamv1beta1_ClusterConfiguration_To_v1beta1_ClusterConfiguration(in, out, s)
 }
 
 func Convert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta1_NodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, out *NodeRegistrationOptions, s apimachineryconversion.Scope) error {
-	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in CABPK v1beta1 API
 	return autoConvert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta1_NodeRegistrationOptions(in, out, s)
 }
 
 func Convert_v1beta1_InitConfiguration_To_upstreamv1beta1_InitConfiguration(in *bootstrapv1.InitConfiguration, out *InitConfiguration, s apimachineryconversion.Scope) error {
-	// InitConfiguration.Patches does not exist in kubeadm v1beta1 API
+	// InitConfiguration.Patches does not exist in CABPK v1beta1 API
 	return autoConvert_v1beta1_InitConfiguration_To_upstreamv1beta1_InitConfiguration(in, out, s)
 }
 
 func Convert_v1beta1_JoinConfiguration_To_upstreamv1beta1_JoinConfiguration(in *bootstrapv1.JoinConfiguration, out *JoinConfiguration, s apimachineryconversion.Scope) error {
-	// JoinConfiguration.Patches does not exist in kubeadm v1beta1 API
+	// JoinConfiguration.Patches does not exist in CABPK v1beta1 API
 	return autoConvert_v1beta1_JoinConfiguration_To_upstreamv1beta1_JoinConfiguration(in, out, s)
 }

bootstrap/kubeadm/types/upstreamv1beta2/conversion.go

@@ -64,22 +64,22 @@ func (dst *JoinConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 }
 
 func Convert_upstreamv1beta2_InitConfiguration_To_v1beta1_InitConfiguration(in *InitConfiguration, out *bootstrapv1.InitConfiguration, s apimachineryconversion.Scope) error {
-	// InitConfiguration.CertificateKey exists in v1beta2 types but not in bootstrapv1.InitConfiguration (Cluster API does not uses automatic copy certs). Ignoring when converting.
+	// InitConfiguration.CertificateKey exists in v1beta2 types but not in CAPBK v1beta1 InitConfiguration (Cluster API does not use automatic copy certs). Ignoring when converting.
 	return autoConvert_upstreamv1beta2_InitConfiguration_To_v1beta1_InitConfiguration(in, out, s)
 }
 
 func Convert_upstreamv1beta2_JoinControlPlane_To_v1beta1_JoinControlPlane(in *JoinControlPlane, out *bootstrapv1.JoinControlPlane, s apimachineryconversion.Scope) error {
-	// JoinControlPlane.CertificateKey exists in v1beta2 types but not in bootstrapv1.JoinControlPlane (Cluster API does not uses automatic copy certs). Ignoring when converting.
+	// JoinControlPlane.CertificateKey exists in v1beta2 types but not in CAPBK v1beta1 JoinControlPlane (Cluster API does not use automatic copy certs). Ignoring when converting.
 	return autoConvert_upstreamv1beta2_JoinControlPlane_To_v1beta1_JoinControlPlane(in, out, s)
 }
 
 func Convert_upstreamv1beta2_DNS_To_v1beta1_DNS(in *DNS, out *bootstrapv1.DNS, s apimachineryconversion.Scope) error {
-	// DNS.Type was removed in v1alpha4 because only CoreDNS is supported, dropping this info.
+	// DNS.Type was removed in CABPK v1alpha4 because only CoreDNS is supported, dropping this info.
 	return autoConvert_upstreamv1beta2_DNS_To_v1beta1_DNS(in, out, s)
 }
 
 func Convert_upstreamv1beta2_ClusterConfiguration_To_v1beta1_ClusterConfiguration(in *ClusterConfiguration, out *bootstrapv1.ClusterConfiguration, s apimachineryconversion.Scope) error {
-	// ClusterConfiguration.UseHyperKubeImage was removed in kubeadm v1alpha4 API
+	// ClusterConfiguration.UseHyperKubeImage was removed in CABPK v1alpha4 API
 	return autoConvert_upstreamv1beta2_ClusterConfiguration_To_v1beta1_ClusterConfiguration(in, out, s)
 }
 

bootstrap/kubeadm/types/upstreamv1beta2/conversion_test.go

@@ -73,52 +73,52 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 func joinControlPlanesFuzzer(obj *JoinControlPlane, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
-	// JoinControlPlane.CertificateKey does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta2 --> v1alpha4 --> v1beta2 round trip errors.
+	// JoinControlPlane.CertificateKey does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta2 --> CABPK v1beta1 --> kubeadm v1beta2 round trip errors.
 	obj.CertificateKey = ""
 }
 
 func initConfigurationFuzzer(obj *InitConfiguration, c fuzz.Continue) {
 	c.Fuzz(obj)
 
-	// InitConfiguration.CertificateKey does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta2 --> v1alpha4 --> v1beta2 round trip errors.
+	// InitConfiguration.CertificateKey does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta2 --> CABPK v1beta1 --> kubeadm v1beta2 round trip errors.
 	obj.CertificateKey = ""
 }
 
 func dnsFuzzer(obj *DNS, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
-	// DNS.Type does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta2 --> v1alpha4 --> v1beta2 round trip errors.
+	// DNS.Type does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta2 --> CABPK v1beta1 --> kubeadm v1beta2 round trip errors.
 	obj.Type = ""
 }
 
 func clusterConfigurationFuzzer(obj *ClusterConfiguration, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
-	// ClusterConfiguration.UseHyperKubeImage has been removed in v1alpha4, so setting it to false in order to avoid v1beta2 --> v1alpha4 --> v1beta2 round trip errors.
+	// ClusterConfiguration.UseHyperKubeImage has been removed in CABPK v1beta1, so setting it to false in order to avoid v1beta2 --> CABPK v1beta1 --> kubeadm v1beta2 round trip errors.
 	obj.UseHyperKubeImage = false
 }
 
 func kubeadmInitConfigurationFuzzer(obj *bootstrapv1.InitConfiguration, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
 	// InitConfiguration.Patches does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
-	// v1beta1 --> upstream v1beta2 -> v1beta1 round trip errors.
+	// CABPK v1beta1 --> kubeadm v1beta2 -> CABPK v1beta1 round trip errors.
 	obj.Patches = nil
 
 	// InitConfiguration.SkipPhases does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
-	// v1beta1 --> upstream v1beta2 -> v1beta1 round trip errors.
+	// CABPK v1beta1 --> kubeadm v1beta2 -> CABPK v1beta1 round trip errors.
 	obj.SkipPhases = nil
 }
 
 func kubeadmJoinConfigurationFuzzer(obj *bootstrapv1.JoinConfiguration, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
 	// JoinConfiguration.Patches does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
-	// v1beta1 --> upstream v1beta2 -> v1beta1 round trip errors.
+	// CABPK v1beta1 --> kubeadm v1beta2 -> CABPK v1beta1 round trip errors.
 	obj.Patches = nil
 
 	// JoinConfiguration.SkipPhases does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
-	// v1beta1 --> upstream v1beta2 -> v1beta1 round trip errors.
+	// CABPK v1beta1 --> kubeadm v1beta2 -> CABPK v1beta1 round trip errors.
 	obj.SkipPhases = nil
 }
 

bootstrap/kubeadm/types/upstreamv1beta3/conversion.go

@@ -60,21 +60,21 @@ func (dst *JoinConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 }
 
 func Convert_upstreamv1beta3_InitConfiguration_To_v1beta1_InitConfiguration(in *InitConfiguration, out *bootstrapv1.InitConfiguration, s apimachineryconversion.Scope) error {
-	// InitConfiguration.CertificateKey and SkipPhases exists in v1beta3 types but not in bootstrapv1.InitConfiguration (Cluster API does not uses automatic copy certs or does not support SkipPhases for now)). Ignoring when converting.
+	// InitConfiguration.CertificateKey and SkipPhases exists in v1beta3 types but not in CAPBK v1beta1 InitConfiguration (Cluster API does not uses automatic copy certs or does not support SkipPhases for now)). Ignoring when converting.
 	return autoConvert_upstreamv1beta3_InitConfiguration_To_v1beta1_InitConfiguration(in, out, s)
 }
 
 func Convert_upstreamv1beta3_JoinConfiguration_To_v1beta1_JoinConfiguration(in *JoinConfiguration, out *bootstrapv1.JoinConfiguration, s apimachineryconversion.Scope) error {
-	// JoinConfiguration.SkipPhases exists in v1beta3 types but not in bootstrapv1.JoinConfiguration (Cluster API does not support SkipPhases for now). Ignoring when converting.
+	// JoinConfiguration.SkipPhases exists in v1beta3 types but not in CAPBK v1beta1 JoinConfiguration (Cluster API does not support SkipPhases for now). Ignoring when converting.
 	return autoConvert_upstreamv1beta3_JoinConfiguration_To_v1beta1_JoinConfiguration(in, out, s)
 }
 
 func Convert_upstreamv1beta3_NodeRegistrationOptions_To_v1beta1_NodeRegistrationOptions(in *NodeRegistrationOptions, out *bootstrapv1.NodeRegistrationOptions, s apimachineryconversion.Scope) error {
-	// NodeRegistrationOptions.IgnorePreflightErrors exists in v1beta3 types but not in bootstrapv1.NodeRegistrationOptions (Cluster API does not support it for now). Ignoring when converting.
+	// NodeRegistrationOptions.IgnorePreflightErrors exists in v1beta3 types but not in CAPBK v1beta1 NodeRegistrationOptions (Cluster API does not support it for now). Ignoring when converting.
 	return autoConvert_upstreamv1beta3_NodeRegistrationOptions_To_v1beta1_NodeRegistrationOptions(in, out, s)
 }
 
 func Convert_upstreamv1beta3_JoinControlPlane_To_v1beta1_JoinControlPlane(in *JoinControlPlane, out *bootstrapv1.JoinControlPlane, s apimachineryconversion.Scope) error {
-	// JoinControlPlane.CertificateKey exists in v1beta3 types but not in bootstrapv1.JoinControlPlane (Cluster API does not uses automatic copy certs). Ignoring when converting.
+	// JoinControlPlane.CertificateKey exists in v1beta3 types but not in CAPBK v1beta1 JoinControlPlane (Cluster API does not use automatic copy certs). Ignoring when converting.
 	return autoConvert_upstreamv1beta3_JoinControlPlane_To_v1beta1_JoinControlPlane(in, out, s)
 }

bootstrap/kubeadm/types/upstreamv1beta3/conversion_test.go

@@ -73,30 +73,30 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 func nodeRegistrationOptionsFuzzer(obj *NodeRegistrationOptions, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
-	// NodeRegistrationOptions.IgnorePreflightErrors does not exists in v1alpha4, so setting it to nil in order to avoid v1beta3 --> v1alpha4 --> v1beta3 round trip errors.
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exists in CABPK v1alpha4, so setting it to nil in order to avoid kubeadm v1beta3 --> CABPK v1beta1 --> kubeadm v1beta3 round trip errors.
 	obj.IgnorePreflightErrors = nil
 }
 
 func joinControlPlanesFuzzer(obj *JoinControlPlane, c fuzz.Continue) {
 	c.FuzzNoCustom(obj)
 
-	// JoinControlPlane.CertificateKey does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta3 --> v1alpha4 --> v1beta3 round trip errors.
+	// JoinControlPlane.CertificateKey does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta3 --> CABPK v1beta1 --> kubeadm v1beta3 round trip errors.
 	obj.CertificateKey = ""
 }
 
 func initConfigurationFuzzer(obj *InitConfiguration, c fuzz.Continue) {
 	c.Fuzz(obj)
 
-	// InitConfiguration.CertificateKey does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta3 --> v1alpha4 --> v1beta3 round trip errors.
+	// InitConfiguration.CertificateKey does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta3 --> CABPK v1beta1 --> kubeadm v1beta3 round trip errors.
 	obj.CertificateKey = ""
 
-	// InitConfiguration.SkipPhases does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta3 --> v1alpha4 --> v1beta3 round trip errors.
+	// InitConfiguration.SkipPhases does not exists in v1beta1, so setting it to empty string in order to avoid v1beta3 --> CABPK v1beta1 --> kubeadm v1beta3 round trip errors.
 	obj.SkipPhases = nil
 }
 
 func joinConfigurationFuzzer(obj *JoinConfiguration, c fuzz.Continue) {
 	c.Fuzz(obj)
 
-	// JoinConfiguration.SkipPhases does not exists in v1alpha4, so setting it to empty string in order to avoid v1beta3 --> v1alpha4 --> v1beta3 round trip errors.
+	// JoinConfiguration.SkipPhases does not exists in CABPK v1beta1, so setting it to empty string in order to avoid v1beta3 --> CABPK v1beta1 --> kubeadm v1beta3 round trip errors.
 	obj.SkipPhases = nil
 }