Merge pull request #11740 from JoelSpeed/update-golangci-lint

k8s-ci-robot · web-flow · commit 8c4bfac7dbc8 · 2025-01-23T02:48:57.000-08:00
🌱 Update golangci-lint to v1.63.4
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -30,6 +30,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # tag=v6.2.0
         with:
-          version: v1.60.2
+          version: v1.63.4
           args: --out-format=colored-line-number
           working-directory: ${{matrix.working-directory}}
diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns_test.go b/controlplane/kubeadm/internal/workload_cluster_coredns_test.go
@@ -552,7 +552,7 @@ func TestUpdateCoreDNS(t *testing.T) {
 						return errors.New("the coredns ConfigMap does not have the Corefile-backup entry or this it has an unexpected value")
 					}
 					return nil
-				}, "5s").Should(BeNil())
+				}, "5s").Should(Succeed())
 
 				// assert CoreDNS deployment
 				var actualDeployment appsv1.Deployment
diff --git a/exp/internal/controllers/machinepool_controller_phases.go b/exp/internal/controllers/machinepool_controller_phases.go
@@ -533,7 +533,7 @@ func (r *MachinePoolReconciler) waitForMachineCreation(ctx context.Context, mach
 	// The polling is against a local memory cache.
 	const waitForCacheUpdateInterval = 100 * time.Millisecond
 
-	for i := range len(machineList) {
+	for i := range machineList {
 		machine := machineList[i]
 		pollErr := wait.PollUntilContextTimeout(ctx, waitForCacheUpdateInterval, waitForCacheUpdateTimeout, true, func(ctx context.Context) (bool, error) {
 			key := client.ObjectKey{Namespace: machine.Namespace, Name: machine.Name}
diff --git a/exp/runtime/internal/controllers/extensionconfig_controller_test.go b/exp/runtime/internal/controllers/extensionconfig_controller_test.go
@@ -157,7 +157,7 @@ func TestExtensionReconciler_Reconcile(t *testing.T) {
 				return errors.Errorf("URL not set on updated object: got: %s, want: %s", *conf.Spec.ClientConfig.URL, updatedServer.URL)
 			}
 			return nil
-		}, 30*time.Second, 100*time.Millisecond).Should(BeNil())
+		}, 30*time.Second, 100*time.Millisecond).Should(Succeed())
 
 		// Reconcile the extension and assert discovery has succeeded.
 		_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: util.ObjectKey(extensionConfig)})
diff --git a/exp/topology/desiredstate/desired_state_test.go b/exp/topology/desiredstate/desired_state_test.go
@@ -1205,7 +1205,13 @@ func TestComputeControlPlaneVersion(t *testing.T) {
 				}
 
 				_, err := r.computeControlPlaneVersion(ctx, tt.s)
-				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneUpgrade) == 1).To(Equal(tt.wantHookToBeCalled))
+
+				if tt.wantHookToBeCalled {
+					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneUpgrade)).To(Equal(1), "Expected hook to be called once")
+				} else {
+					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneUpgrade)).To(Equal(0), "Did not expect hook to be called")
+				}
+
 				g.Expect(hooks.IsPending(runtimehooksv1.AfterControlPlaneUpgrade, tt.s.Current.Cluster)).To(Equal(tt.wantIntentToCall))
 				g.Expect(err != nil).To(Equal(tt.wantErr))
 				if tt.wantHookToBeCalled && !tt.wantErr {
diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
@@ -1022,7 +1022,7 @@ func (r *Reconciler) adoptOrphan(ctx context.Context, machineSet *clusterv1.Mach
 func (r *Reconciler) waitForMachineCreation(ctx context.Context, machineList []*clusterv1.Machine) error {
 	log := ctrl.LoggerFrom(ctx)
 
-	for i := range len(machineList) {
+	for i := range machineList {
 		machine := machineList[i]
 		pollErr := wait.PollUntilContextTimeout(ctx, stateConfirmationInterval, stateConfirmationTimeout, true, func(ctx context.Context) (bool, error) {
 			key := client.ObjectKey{Namespace: machine.Namespace, Name: machine.Name}
@@ -1048,7 +1048,7 @@ func (r *Reconciler) waitForMachineCreation(ctx context.Context, machineList []*
 func (r *Reconciler) waitForMachineDeletion(ctx context.Context, machineList []*clusterv1.Machine) error {
 	log := ctrl.LoggerFrom(ctx)
 
-	for i := range len(machineList) {
+	for i := range machineList {
 		machine := machineList[i]
 		pollErr := wait.PollUntilContextTimeout(ctx, stateConfirmationInterval, stateConfirmationTimeout, true, func(ctx context.Context) (bool, error) {
 			m := &clusterv1.Machine{}
diff --git a/internal/controllers/topology/cluster/cluster_controller_test.go b/internal/controllers/topology/cluster/cluster_controller_test.go
@@ -578,7 +578,12 @@ func TestClusterReconciler_reconcileDelete(t *testing.T) {
 				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(res).To(BeComparableTo(tt.wantResult))
 				g.Expect(hooks.IsOkToDelete(tt.cluster)).To(Equal(tt.wantOkToDelete))
-				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete) == 1).To(Equal(tt.wantHookToBeCalled))
+
+				if tt.wantHookToBeCalled {
+					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(1), "Expected hook to be called once")
+				} else {
+					g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(0), "Did not expect hook to be called")
+				}
 			}
 		})
 	}
diff --git a/internal/controllers/topology/cluster/reconcile_state_test.go b/internal/controllers/topology/cluster/reconcile_state_test.go
@@ -471,7 +471,13 @@ func TestReconcile_callAfterControlPlaneInitialized(t *testing.T) {
 			}
 
 			err := r.callAfterControlPlaneInitialized(ctx, s)
-			g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneInitialized) == 1).To(Equal(tt.wantHookToBeCalled))
+
+			if tt.wantHookToBeCalled {
+				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneInitialized)).To(Equal(1), "Expected hook to be called once")
+			} else {
+				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterControlPlaneInitialized)).To(Equal(0), "Did not expect hook to be called")
+			}
+
 			g.Expect(hooks.IsPending(runtimehooksv1.AfterControlPlaneInitialized, tt.cluster)).To(Equal(tt.wantMarked))
 			g.Expect(err != nil).To(Equal(tt.wantError))
 		})
@@ -1089,7 +1095,13 @@ func TestReconcile_callAfterClusterUpgrade(t *testing.T) {
 			}
 
 			err := r.callAfterClusterUpgrade(ctx, tt.s)
-			g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterClusterUpgrade) == 1).To(Equal(tt.wantHookToBeCalled))
+
+			if tt.wantHookToBeCalled {
+				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterClusterUpgrade)).To(Equal(1), "Expected hook to be called once")
+			} else {
+				g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.AfterClusterUpgrade)).To(Equal(0), "Did not expect hook to be called")
+			}
+
 			g.Expect(hooks.IsPending(runtimehooksv1.AfterClusterUpgrade, tt.s.Current.Cluster)).To(Equal(tt.wantMarked))
 			g.Expect(err != nil).To(Equal(tt.wantError))
 		})
diff --git a/test/e2e/clusterclass_changes.go b/test/e2e/clusterclass_changes.go
@@ -301,7 +301,7 @@ func modifyControlPlaneViaClusterClassAndWait(ctx context.Context, input modifyC
 			g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))
 		}
 		return nil
-	}, input.WaitForControlPlane...).Should(BeNil())
+	}, input.WaitForControlPlane...).Should(Succeed())
 }
 
 // assertControlPlaneTopologyFields asserts that all fields set in the ControlPlaneTopology have been set on the ControlPlane.
@@ -454,7 +454,7 @@ func modifyMachineDeploymentViaClusterClassAndWait(ctx context.Context, input mo
 					g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))
 				}
 				return nil
-			}, input.WaitForMachineDeployments...).Should(BeNil())
+			}, input.WaitForMachineDeployments...).Should(Succeed())
 		}
 	}
 }
@@ -580,7 +580,7 @@ func modifyMachinePoolViaClusterClassAndWait(ctx context.Context, input modifyMa
 					g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))
 				}
 				return nil
-			}, input.WaitForMachinePools...).Should(BeNil())
+			}, input.WaitForMachinePools...).Should(Succeed())
 		}
 	}
 }
@@ -735,7 +735,7 @@ func rebaseClusterClassAndWait(ctx context.Context, input rebaseClusterClassAndW
 			}
 
 			return nil
-		}, input.WaitForMachineDeployments...).Should(BeNil())
+		}, input.WaitForMachineDeployments...).Should(Succeed())
 	}
 
 	// Verify that the ControlPlane has not been changed.
@@ -783,5 +783,5 @@ func deleteMachineDeploymentTopologyAndWait(ctx context.Context, input deleteMac
 			return errors.Errorf("expected no MachineDeployment for topology %q, but got %d", mdTopologyToDelete.Name, len(mdList.Items))
 		}
 		return nil
-	}, input.WaitForMachineDeployments...).Should(BeNil())
+	}, input.WaitForMachineDeployments...).Should(Succeed())
 }
diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go
@@ -236,11 +236,11 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 		Consistently(func() error {
 			kubeSystem := &corev1.Namespace{}
 			return input.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-		}, "5s", "100ms").Should(BeNil(), "Failed to assert bootstrap API server stability")
+		}, "5s", "100ms").Should(Succeed(), "Failed to assert bootstrap API server stability")
 		Consistently(func() error {
 			kubeSystem := &corev1.Namespace{}
 			return selfHostedClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-		}, "5s", "100ms").Should(BeNil(), "Failed to assert self-hosted API server stability")
+		}, "5s", "100ms").Should(Succeed(), "Failed to assert self-hosted API server stability")
 
 		// Get the machines of the workloadCluster before it is moved to become self-hosted to make sure that the move did not trigger
 		// any unexpected rollouts.
@@ -438,11 +438,11 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 			Consistently(func() error {
 				kubeSystem := &corev1.Namespace{}
 				return input.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-			}, "5s", "100ms").Should(BeNil(), "Failed to assert bootstrap API server stability")
+			}, "5s", "100ms").Should(Succeed(), "Failed to assert bootstrap API server stability")
 			Consistently(func() error {
 				kubeSystem := &corev1.Namespace{}
 				return selfHostedClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
-			}, "5s", "100ms").Should(BeNil(), "Failed to assert self-hosted API server stability")
+			}, "5s", "100ms").Should(Succeed(), "Failed to assert self-hosted API server stability")
 
 			By("Moving the cluster back to bootstrap")
 			clusterctl.Move(ctx, clusterctl.MoveInput{

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ func TestUpdateCoreDNS(t *testing.T) {`
`552`	`552`	`return errors.New("the coredns ConfigMap does not have the Corefile-backup entry or this it has an unexpected value")`
`553`	`553`	`}`
`554`	`554`	`return nil`
`555`		`- }, "5s").Should(BeNil())`
	`555`	`+ }, "5s").Should(Succeed())`
`556`	`556`
`557`	`557`	`// assert CoreDNS deployment`
`558`	`558`	`var actualDeployment appsv1.Deployment`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func TestExtensionReconciler_Reconcile(t *testing.T) {`
`157`	`157`	`return errors.Errorf("URL not set on updated object: got: %s, want: %s", *conf.Spec.ClientConfig.URL, updatedServer.URL)`
`158`	`158`	`}`
`159`	`159`	`return nil`
`160`		`- }, 30time.Second, 100time.Millisecond).Should(BeNil())`
	`160`	`+ }, 30time.Second, 100time.Millisecond).Should(Succeed())`
`161`	`161`
`162`	`162`	`// Reconcile the extension and assert discovery has succeeded.`
`163`	`163`	`_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: util.ObjectKey(extensionConfig)})`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,12 @@ func TestClusterReconciler_reconcileDelete(t *testing.T) {`
`578`	`578`	`g.Expect(err).ToNot(HaveOccurred())`
`579`	`579`	`g.Expect(res).To(BeComparableTo(tt.wantResult))`
`580`	`580`	`g.Expect(hooks.IsOkToDelete(tt.cluster)).To(Equal(tt.wantOkToDelete))`
`581`		`- g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete) == 1).To(Equal(tt.wantHookToBeCalled))`
	`581`	`+`
	`582`	`+ if tt.wantHookToBeCalled {`
	`583`	`+ g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(1), "Expected hook to be called once")`
	`584`	`+ } else {`
	`585`	`+ g.Expect(fakeRuntimeClient.CallAllCount(runtimehooksv1.BeforeClusterDelete)).To(Equal(0), "Did not expect hook to be called")`
	`586`	`+ }`
`582`	`587`	`}`
`583`	`588`	`})`
`584`	`589`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ func modifyControlPlaneViaClusterClassAndWait(ctx context.Context, input modifyC`
`301`	`301`	`g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))`
`302`	`302`	`}`
`303`	`303`	`return nil`
`304`		`- }, input.WaitForControlPlane...).Should(BeNil())`
	`304`	`+ }, input.WaitForControlPlane...).Should(Succeed())`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`// assertControlPlaneTopologyFields asserts that all fields set in the ControlPlaneTopology have been set on the ControlPlane.`
`@@ -454,7 +454,7 @@ func modifyMachineDeploymentViaClusterClassAndWait(ctx context.Context, input mo`
`454`	`454`	`g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))`
`455`	`455`	`}`
`456`	`456`	`return nil`
`457`		`- }, input.WaitForMachineDeployments...).Should(BeNil())`
	`457`	`+ }, input.WaitForMachineDeployments...).Should(Succeed())`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`	`}`
`@@ -580,7 +580,7 @@ func modifyMachinePoolViaClusterClassAndWait(ctx context.Context, input modifyMa`
`580`	`580`	`g.Expect(currentValue).To(Equal(expectedValue), fmt.Sprintf("field %q should be equal", fieldPath))`
`581`	`581`	`}`
`582`	`582`	`return nil`
`583`		`- }, input.WaitForMachinePools...).Should(BeNil())`
	`583`	`+ }, input.WaitForMachinePools...).Should(Succeed())`
`584`	`584`	`}`
`585`	`585`	`}`
`586`	`586`	`}`
`@@ -735,7 +735,7 @@ func rebaseClusterClassAndWait(ctx context.Context, input rebaseClusterClassAndW`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`return nil`
`738`		`- }, input.WaitForMachineDeployments...).Should(BeNil())`
	`738`	`+ }, input.WaitForMachineDeployments...).Should(Succeed())`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`// Verify that the ControlPlane has not been changed.`
`@@ -783,5 +783,5 @@ func deleteMachineDeploymentTopologyAndWait(ctx context.Context, input deleteMac`
`783`	`783`	`return errors.Errorf("expected no MachineDeployment for topology %q, but got %d", mdTopologyToDelete.Name, len(mdList.Items))`
`784`	`784`	`}`
`785`	`785`	`return nil`
`786`		`- }, input.WaitForMachineDeployments...).Should(BeNil())`
	`786`	`+ }, input.WaitForMachineDeployments...).Should(Succeed())`
`787`	`787`	`}`