Remove lint ignore for gocritic

kubernetes-sigs · Sep 27, 2023 · 31b7daf · 31b7daf
1 parent ed46a47
commit 31b7daf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/controllers/controllers_suite_test.go b/controllers/controllers_suite_test.go
@@ -51,9 +51,9 @@ var (
 
 func TestMain(m *testing.M) {
 	setup()
-	defer teardown()
 	code := m.Run()
-	os.Exit(code) //nolint:gocritic
+	teardown()
+	os.Exit(code)
 }
 
 func setup() {

diff --git a/controllers/vspheremachine_controller.go b/controllers/vspheremachine_controller.go
@@ -291,19 +291,16 @@ func (r *machineReconciler) reconcileNormal(ctx context.Context, machineCtx capv
 		return reconcile.Result{}, nil
 	}
 
-	//nolint:gocritic
 	if r.supervisorBased {
 		err := r.setVMModifiers(ctx, machineCtx)
 		if err != nil {
 			return reconcile.Result{}, err
 		}
-	} else {
+	} else if !machineCtx.GetCluster().Status.InfrastructureReady {
 		// vmwarev1.VSphereCluster doesn't set Cluster.Status.Ready until the API endpoint is available.
-		if !machineCtx.GetCluster().Status.InfrastructureReady {
-			log.Info("Cluster infrastructure is not ready yet")
-			conditions.MarkFalse(machineCtx.GetVSphereMachine(), infrav1.VMProvisionedCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1.ConditionSeverityInfo, "")
-			return reconcile.Result{}, nil
-		}
+		log.Info("Cluster infrastructure is not ready yet")
+		conditions.MarkFalse(machineCtx.GetVSphereMachine(), infrav1.VMProvisionedCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1.ConditionSeverityInfo, "")
+		return reconcile.Result{}, nil
 	}
 
 	// Make sure bootstrap data is available and populated.

diff --git a/pkg/services/govmomi/service.go b/pkg/services/govmomi/service.go
@@ -530,17 +530,10 @@ func (vms *VMService) getMetadata(ctx *virtualMachineContext) (string, error) {
 
 	var metadataBase64 string
 	for _, ec := range obj.Config.ExtraConfig {
-		if optVal := ec.GetOptionValue(); optVal != nil {
-			// TODO(akutz) Using a switch instead of if in case we ever
-			//             want to check the metadata encoding as well.
-			//             Since the image stamped images always use
-			//             base64, it should be okay to not check.
-			//nolint:gocritic
-			switch optVal.Key {
-			case guestInfoKeyMetadata:
-				if v, ok := optVal.Value.(string); ok {
-					metadataBase64 = v
-				}
+		if optVal := ec.GetOptionValue(); optVal != nil && optVal.Key == guestInfoKeyMetadata {
+			if v, ok := optVal.Value.(string); ok {
+				metadataBase64 = v
+				break
 			}
 		}
 	}