fix loopvar linter issue and usage of deprecated grpc function

controlplane/kubeadm/internal/etcd/etcd.go

@@ -149,7 +149,6 @@ func NewClient(ctx context.Context, config ClientConfiguration) (*Client, error)
 		Endpoints:   []string{config.Endpoint}, // NOTE: endpoint is used only as a host for certificate validation, the network connection is defined by DialOptions.
 		DialTimeout: config.DialTimeout,
 		DialOptions: []grpc.DialOption{
-			grpc.WithBlock(), // block until the underlying connection is up
 			grpc.WithContextDialer(dialer.DialContextWithAddr),
 		},
 		TLS: config.TLSConfig,

internal/controllers/machinedeployment/mdutil/util.go

@@ -430,8 +430,6 @@ func FindNewMachineSet(deployment *clusterv1.MachineDeployment, msList []*cluste
 	var matchingMachineSets []*clusterv1.MachineSet
 	var diffs []string
 	for _, ms := range msList {
-		ms := ms
-
 		equal, diff, err := EqualMachineTemplate(&ms.Spec.Template, &deployment.Spec.Template)
 		if err != nil {
 			return nil, "", errors.Wrapf(err, "failed to compare MachineDeployment spec template with MachineSet %s", ms.Name)
@@ -459,7 +457,6 @@ func FindNewMachineSet(deployment *clusterv1.MachineDeployment, msList []*cluste
 
 	// Pick the first matching MachineSet that has been created after RolloutAfter.
 	for _, ms := range matchingMachineSets {
-		ms := ms
 		if ms.CreationTimestamp.After(deployment.Spec.RolloutAfter.Time) {
 			return ms, "", nil
 		}

test/infrastructure/inmemory/pkg/server/mux_test.go

@@ -369,7 +369,6 @@ func TestAPI_PortForward(t *testing.T) {
 		DialTimeout: 2 * time.Second,
 
 		DialOptions: []grpc.DialOption{
-			grpc.WithBlock(), // block until the underlying connection is up
 			grpc.WithContextDialer(dialer2.DialContextWithAddr),
 		},
 		TLS: &tls.Config{