remove nolint-staticcheck usage

kubernetes-sigs · Oct 11, 2023 · 0cb27e0 · 0cb27e0
1 parent 4971ae2
commit 0cb27e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/controllers/vmware/vspherecluster_reconciler.go b/controllers/vmware/vspherecluster_reconciler.go
@@ -309,7 +309,7 @@ func (r *ClusterReconciler) reconcileAPIEndpoints(ctx context.Context, clusterCt
 				clusterCtx.VSphereCluster.Namespace, clusterCtx.VSphereCluster.Name, machine.Name)
 		}
 		log = log.WithValues("VSphereMachine", klog.KObj(vsphereMachine))
-		ctx = ctrl.LoggerInto(ctx, log) //nolint:ineffassign,staticcheck // ensure the logger is up-to-date in ctx, even if we currently don't use ctx below.
+		ctx = ctrl.LoggerInto(ctx, log) //nolint:ineffassign // ensure the logger is up-to-date in ctx, even if we currently don't use ctx below.
 
 		// If the machine has no IP address then skip it.
 		if vsphereMachine.Status.IPAddr == "" {

diff --git a/controllers/vspheredeploymentzone_controller_domain.go b/controllers/vspheredeploymentzone_controller_domain.go
@@ -85,7 +85,7 @@ func (r vsphereDeploymentZoneReconciler) reconcileFailureDomain(ctx context.Cont
 }
 
 func (r vsphereDeploymentZoneReconciler) reconcileInfraFailureDomain(ctx context.Context, deploymentZoneCtx *capvcontext.VSphereDeploymentZoneContext, vsphereFailureDomain *infrav1.VSphereFailureDomain, failureDomain infrav1.FailureDomain) error {
-	if *failureDomain.AutoConfigure { //nolint:staticcheck
+	if *failureDomain.AutoConfigure {
 		return r.createAndAttachMetadata(ctx, deploymentZoneCtx, vsphereFailureDomain, failureDomain)
 	}
 	return r.verifyFailureDomain(ctx, deploymentZoneCtx, vsphereFailureDomain, failureDomain)

diff --git a/internal/webhooks/vspherefailuredomain.go b/internal/webhooks/vspherefailuredomain.go
@@ -107,12 +107,12 @@ func (webhook *VSphereFailureDomainWebhook) Default(_ context.Context, obj runti
 	if !ok {
 		return apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereFailureDomain but got a %T", obj))
 	}
-	if typedObj.Spec.Zone.AutoConfigure == nil { //nolint:staticcheck
-		typedObj.Spec.Zone.AutoConfigure = pointer.Bool(false) //nolint:staticcheck
+	if typedObj.Spec.Zone.AutoConfigure == nil {
+		typedObj.Spec.Zone.AutoConfigure = pointer.Bool(false)
 	}
 
-	if typedObj.Spec.Region.AutoConfigure == nil { //nolint:staticcheck
-		typedObj.Spec.Region.AutoConfigure = pointer.Bool(false) //nolint:staticcheck
+	if typedObj.Spec.Region.AutoConfigure == nil {
+		typedObj.Spec.Region.AutoConfigure = pointer.Bool(false)
 	}
 
 	return nil

diff --git a/internal/webhooks/vspherefailuredomain_test.go b/internal/webhooks/vspherefailuredomain_test.go
@@ -34,8 +34,8 @@ func TestVsphereFailureDomain_Default(t *testing.T) {
 	webhook := &VSphereFailureDomainWebhook{}
 	g.Expect(webhook.Default(context.Background(), m)).ToNot(HaveOccurred())
 
-	g.Expect(*m.Spec.Zone.AutoConfigure).To(BeFalse())   //nolint:staticcheck
-	g.Expect(*m.Spec.Region.AutoConfigure).To(BeFalse()) //nolint:staticcheck
+	g.Expect(*m.Spec.Zone.AutoConfigure).To(BeFalse())
+	g.Expect(*m.Spec.Region.AutoConfigure).To(BeFalse())
 }
 
 func TestVSphereFailureDomain_ValidateCreate(t *testing.T) {