⚠️ remove TypeMeta from KubeadmConfigSpec

api/bootstrap/kubeadm/v1beta1/conversion.go

@@ -312,6 +312,14 @@ func Convert_v1beta1_BootstrapToken_To_v1beta2_BootstrapToken(in *BootstrapToken
 	return nil
 }
 
+func Convert_v1beta1_InitConfiguration_To_v1beta2_InitConfiguration(in *InitConfiguration, out *bootstrapv1.InitConfiguration, s apimachineryconversion.Scope) error {
+	return autoConvert_v1beta1_InitConfiguration_To_v1beta2_InitConfiguration(in, out, s)
+}
+
+func Convert_v1beta1_JoinConfiguration_To_v1beta2_JoinConfiguration(in *JoinConfiguration, out *bootstrapv1.JoinConfiguration, s apimachineryconversion.Scope) error {
+	return autoConvert_v1beta1_JoinConfiguration_To_v1beta2_JoinConfiguration(in, out, s)
+}
+
 // Implement local conversion func because conversion-gen is not aware of conversion func in other packages (see https://github.com/kubernetes/code-generator/issues/94)
 
 func Convert_v1beta1_ObjectMeta_To_v1beta2_ObjectMeta(in *clusterv1beta1.ObjectMeta, out *clusterv1.ObjectMeta, s apimachineryconversion.Scope) error {

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -72,13 +72,9 @@ const (
 	KubeadmConfigDataSecretNotAvailableReason = clusterv1.NotAvailableReason
 )
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
 // InitConfiguration contains a list of elements that is specific "kubeadm init"-only runtime
 // information.
 type InitConfiguration struct {
-	metav1.TypeMeta `json:",inline"`
-
 	// bootstrapTokens is respected at `kubeadm init` time and describes a set of Bootstrap Tokens to create.
 	// This information IS NOT uploaded to the kubeadm cluster configmap, partly because of its sensitive nature
 	// +optional
@@ -119,12 +115,8 @@ type InitConfiguration struct {
 	Timeouts *Timeouts `json:"timeouts,omitempty"`
 }
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
 // ClusterConfiguration contains cluster-wide configuration for a kubeadm cluster.
 type ClusterConfiguration struct {
-	metav1.TypeMeta `json:",inline"`
-
 	// etcd holds configuration for etcd.
 	// NB: This value defaults to a Local (stacked) etcd
 	// +optional
@@ -494,12 +486,8 @@ type ExternalEtcd struct {
 	KeyFile string `json:"keyFile"`
 }
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
 // JoinConfiguration contains elements describing a particular node.
 type JoinConfiguration struct {
-	metav1.TypeMeta `json:",inline"`
-
 	// nodeRegistration holds fields that relate to registering the new control-plane node to the cluster.
 	// When used in the context of control plane nodes, NodeRegistration should remain consistent
 	// across both InitConfiguration and JoinConfiguration