fixes

Author: chrischdi

packaging/flavorgen/flavors/clusterclass_generators.go

@@ -46,12 +46,14 @@ func newClusterClass() clusterv1.ClusterClass {
 			Name: env.ClusterClassNameVar,
 		},
 		Spec: clusterv1.ClusterClassSpec{
-			Infrastructure: clusterv1.LocalObjectTemplate{
-				Ref: &corev1.ObjectReference{
-					APIVersion: infrav1.GroupVersion.String(),
-					Kind:       util.TypeToKind(&infrav1.VSphereClusterTemplate{}),
-					Namespace:  env.NamespaceVar,
-					Name:       env.ClusterClassNameVar,
+			Infrastructure: clusterv1.InfrastructureClass{
+				LocalObjectTemplate: clusterv1.LocalObjectTemplate{
+					Ref: &corev1.ObjectReference{
+						APIVersion: infrav1.GroupVersion.String(),
+						Kind:       util.TypeToKind(&infrav1.VSphereClusterTemplate{}),
+						Namespace:  env.NamespaceVar,
+						Name:       env.ClusterClassNameVar,
+					},
 				},
 			},
 			ControlPlane: getControlPlaneClass(),
@@ -72,12 +74,14 @@ func newVMWareClusterClass() clusterv1.ClusterClass {
 			Name: env.ClusterClassNameVar,
 		},
 		Spec: clusterv1.ClusterClassSpec{
-			Infrastructure: clusterv1.LocalObjectTemplate{
-				Ref: &corev1.ObjectReference{
-					APIVersion: vmwarev1.GroupVersion.String(),
-					Kind:       util.TypeToKind(&vmwarev1.VSphereClusterTemplate{}),
-					Namespace:  env.NamespaceVar,
-					Name:       env.ClusterClassNameVar,
+			Infrastructure: clusterv1.InfrastructureClass{
+				LocalObjectTemplate: clusterv1.LocalObjectTemplate{
+					Ref: &corev1.ObjectReference{
+						APIVersion: vmwarev1.GroupVersion.String(),
+						Kind:       util.TypeToKind(&vmwarev1.VSphereClusterTemplate{}),
+						Namespace:  env.NamespaceVar,
+						Name:       env.ClusterClassNameVar,
+					},
 				},
 			},
 			ControlPlane: getVMWareControlPlaneClass(),

packaging/flavorgen/flavors/generators.go

@@ -488,9 +488,7 @@ func ignitionKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfig
 		},
 		Users:              flatcarUsers(),
 		PreKubeadmCommands: flatcarPreKubeadmCommands(),
-		// UseExperimentalRetryJoin isn't supported with Ignition bootstrap.
-		UseExperimentalRetryJoin: false,
-		Files:                    files,
+		Files:              files,
 	}
 }