fix lint

Signed-off-by: sivchari <[email protected]>

Author: sivchari

test/e2e/clusterctl_upgrade.go

@@ -811,53 +811,6 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 	})
 }
 
-// verifyV1Beta2ConditionsTrueV1Beta1 checks the Cluster and Machines of a Cluster that
-// the given v1beta2 condition types are set to true without a message, if they exist.
-func verifyV1Beta2ConditionsTrueV1Beta1(ctx context.Context, c client.Client, clusterName, clusterNamespace string, v1beta2conditionTypes []string) {
-	cluster := &clusterv1beta1.Cluster{}
-	key := client.ObjectKey{
-		Namespace: clusterNamespace,
-		Name:      clusterName,
-	}
-	Eventually(func() error {
-		return c.Get(ctx, key, cluster)
-	}, 3*time.Minute, 3*time.Second).Should(Succeed(), "Failed to get Cluster object %s", klog.KRef(clusterNamespace, clusterName))
-
-	if cluster.Status.V1Beta2 != nil && len(cluster.Status.V1Beta2.Conditions) > 0 {
-		for _, conditionType := range v1beta2conditionTypes {
-			for _, condition := range cluster.Status.V1Beta2.Conditions {
-				if condition.Type != conditionType {
-					continue
-				}
-				Expect(condition.Status).To(Equal(metav1.ConditionTrue), "The v1beta2 condition %q on the Cluster should be set to true", conditionType)
-				Expect(condition.Message).To(BeEmpty(), "The v1beta2 condition %q on the Cluster should have an empty message", conditionType)
-			}
-		}
-	}
-
-	machineList := &clusterv1beta1.MachineList{}
-	Eventually(func() error {
-		return c.List(ctx, machineList, client.InNamespace(clusterNamespace),
-			client.MatchingLabels{
-				clusterv1.ClusterNameLabel: clusterName,
-			})
-	}, 3*time.Minute, 3*time.Second).Should(Succeed(), "Failed to list Machines for Cluster %s", klog.KObj(cluster))
-	for _, machine := range machineList.Items {
-		if machine.Status.V1Beta2 == nil || len(machine.Status.V1Beta2.Conditions) == 0 {
-			continue
-		}
-		for _, conditionType := range v1beta2conditionTypes {
-			for _, condition := range machine.Status.V1Beta2.Conditions {
-				if condition.Type != conditionType {
-					continue
-				}
-				Expect(condition.Status).To(Equal(metav1.ConditionTrue), "The v1beta2 condition %q on the Machine %q should be set to true", conditionType, machine.Name)
-				Expect(condition.Message).To(BeEmpty(), "The v1beta2 condition %q on the Machine %q should have an empty message", conditionType, machine.Name)
-			}
-		}
-	}
-}
-
 func setupClusterctl(ctx context.Context, clusterctlBinaryURL, clusterctlConfigPath string) (string, string) {
 	clusterctlBinaryPath := downloadToTmpFile(ctx, clusterctlBinaryURL)
 

test/e2e/common.go

@@ -82,4 +82,3 @@ func GetLatestReleaseOfMinor(ctx context.Context, minorRelease string) (string,
 	releaseMarker := fmt.Sprintf(latestReleaseMarkerPrefix, minorRelease)
 	return clusterctl.ResolveRelease(ctx, releaseMarker)
 }
-

test/e2e/machine_pool.go

@@ -30,7 +30,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/ptr"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	"sigs.k8s.io/cluster-api/util"
@@ -142,15 +141,16 @@ func MachinePoolSpec(ctx context.Context, inputGetter func() MachinePoolInput) {
 
 		Byf("Verify Cluster Available condition is true")
 		framework.VerifyClusterAvailable(ctx, framework.VerifyClusterAvailableInput{
-			Getter:  input.BootstrapClusterProxy.GetClient(),
-			Cluster: clusterResources.Cluster,
+			Getter:    input.BootstrapClusterProxy.GetClient(),
+			Name:      clusterResources.Cluster.Name,
+			Namespace: clusterResources.Cluster.Namespace,
 		})
 
 		Byf("Verify Machines Ready condition is true")
 		framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
-			Lister:      input.BootstrapClusterProxy.GetClient(),
-			ClusterName: clusterResources.Cluster.Name,
-			Namespace:   clusterResources.Cluster.Namespace,
+			Lister:    input.BootstrapClusterProxy.GetClient(),
+			Name:      clusterResources.Cluster.Name,
+			Namespace: clusterResources.Cluster.Namespace,
 		})
 
 		By("PASSED!")