From 66be51b2b76b58bf7390c3e455d4e1644e50412e Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 15 Nov 2024 08:33:38 -0500 Subject: [PATCH] Address intrange linter violations Signed-off-by: Tom Pantelis --- pkg/cable/libreswan/libreswan.go | 4 ++-- pkg/cableengine/syncer/syncer_test.go | 2 +- pkg/globalnet/main.go | 2 +- pkg/netlink/netlink.go | 2 +- pkg/packetfilter/adapter.go | 2 +- pkg/pinger/pinger_test.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/cable/libreswan/libreswan.go b/pkg/cable/libreswan/libreswan.go index 142c3ed76..648e510d5 100644 --- a/pkg/cable/libreswan/libreswan.go +++ b/pkg/cable/libreswan/libreswan.go @@ -320,7 +320,7 @@ func extractSubnets(endpoint *subv1.EndpointSpec) []string { func whack(args ...string) error { var err error - for i := 0; i < 3; i++ { + for range 3 { err = func() error { ctx, cancel := context.WithTimeout(context.TODO(), whackTimeout) defer cancel() @@ -653,7 +653,7 @@ func (i *libreswan) waitForControlSocket() error { const retryInterval = 100 * time.Millisecond const controlSocketPath = "/run/pluto/pluto.ctl" - for i := 0; i < maxAttempts; i++ { + for range maxAttempts { _, err := os.Stat(controlSocketPath) if err == nil { return nil diff --git a/pkg/cableengine/syncer/syncer_test.go b/pkg/cableengine/syncer/syncer_test.go index 42ce608cd..d7bc56f34 100644 --- a/pkg/cableengine/syncer/syncer_test.go +++ b/pkg/cableengine/syncer/syncer_test.go @@ -96,7 +96,7 @@ func testGatewaySyncing() { It("should periodically update the Gateway resource timestamp", func() { var lastTimestamp int64 - for i := 0; i < 3; i++ { + for range 3 { var currentTimestamp int64 Eventually(func() int64 { diff --git a/pkg/globalnet/main.go b/pkg/globalnet/main.go index 1be107a34..9ff12ff10 100644 --- a/pkg/globalnet/main.go +++ b/pkg/globalnet/main.go @@ -113,7 +113,7 @@ func main() { var localCluster *submarinerv1.Cluster // During installation, sometimes creation of clusterCRD by submariner-gateway-pod would take few secs. - for i := 0; i < 100; i++ { + for range 100 { localCluster, err = submarinerClient.SubmarinerV1().Clusters(spec.Namespace).Get(context.TODO(), spec.ClusterID, metav1.GetOptions{}) if err == nil { diff --git a/pkg/netlink/netlink.go b/pkg/netlink/netlink.go index 8e35bcffb..69c774528 100644 --- a/pkg/netlink/netlink.go +++ b/pkg/netlink/netlink.go @@ -184,7 +184,7 @@ func (n *netlinkType) EnableLooseModeReversePathFilter(interfaceName string) err } func (n *netlinkType) EnsureLooseModeIsConfigured(interfaceName string) error { - for i := 0; i < 10; i++ { + for range 10 { // Revisit: This is a temporary work-around to fix https://github.com/submariner-io/submariner/issues/2422 // Allow the interface to get initialized. time.Sleep(100 * time.Millisecond) diff --git a/pkg/packetfilter/adapter.go b/pkg/packetfilter/adapter.go index 15c5f5ec4..a4ac9f77f 100644 --- a/pkg/packetfilter/adapter.go +++ b/pkg/packetfilter/adapter.go @@ -63,7 +63,7 @@ func (a *Adapter) ensureRuleAtPosition(table TableType, chain string, existingRu // The required rule is present in the chain, but either there are multiple occurrences or it's not at the desired position. if numOccurrences > 1 || !isPresentAtRequiredPosition { - for i := 0; i < numOccurrences; i++ { + for range numOccurrences { logger.V(level.TRACE).Infof("Deleting misplaced occurrence of rule %q from table %q, chain %q", rule, table, chain) if err := a.Delete(table, chain, rule); err != nil { diff --git a/pkg/pinger/pinger_test.go b/pkg/pinger/pinger_test.go index 43817ecf5..1079d8c8b 100644 --- a/pkg/pinger/pinger_test.go +++ b/pkg/pinger/pinger_test.go @@ -101,7 +101,7 @@ var _ = Describe("Pinger", func() { verifyPingStats := func(count int) { last := &pinger.LatencyInfo{} - for i := 0; i < count; i++ { + for range count { var current *pinger.LatencyInfo Eventually(func() *pinger.LatencyInfo {