@@ -628,7 +628,7 @@ func parsePortSpec(rawPort string) ([]network.PortMap, error) {

 	count := endPort - startPort + 1

 	ports := make([]network.PortMap, 0, count)

-	for i := uint16(0); i < count; i++ {

+	for i := range count {

 		hPort := ""

 		if hostPort != "" {

 			hPort = strconv.Itoa(int(startHostPort + i))

@@ -302,7 +302,7 @@ func TestTarSumsReadSize(t *testing.T) {

 	// Test always on the same layer (that is big enough)

 	layer := testLayers[0]

-	for i := 0; i < 5; i++ {

+	for i := range 5 {

 		reader, err := os.Open(layer.filename)

 		if err != nil {

 			t.Fatal(err)

@@ -296,7 +296,7 @@ func TestOtelMeterLeak(t *testing.T) {

 	runtime.ReadMemStats(&before)

 	const counters = 10 * 1000 * 1000

-	for i := 0; i < counters; i++ {

+	for range counters {

 		_, _ = meter.Int64Counter("bar")

 	}

@@ -41,7 +41,7 @@ func benchmarkReplaceOrAppendEnvValues(b *testing.B, extraEnv int) {

 	if extraEnv > 0 {

 		buf := make([]byte, 5)

-		for i := 0; i < extraEnv; i++ {

+		for range extraEnv {

 			n, err := rand.Read(buf)

 			assert.NilError(b, err)

 			key := string(buf[:n])

@@ -347,7 +347,7 @@ func assertIndexGet(t *testing.T, snapshot *ViewDB, input, expectedResult string

 func BenchmarkDBAdd100(b *testing.B) {

 	var testSet []string

-	for i := 0; i < 100; i++ {

+	for range 100 {

 		testSet = append(testSet, stringid.GenerateRandomID())

 	}

@@ -367,7 +367,7 @@ func BenchmarkDBAdd100(b *testing.B) {

 func BenchmarkDBGetByPrefix100(b *testing.B) {

 	var testSet []string

 	var testKeys []string

-	for i := 0; i < 100; i++ {

+	for range 100 {

 		testSet = append(testSet, stringid.GenerateRandomID())

 	}

 	db, err := NewViewDB()

@@ -394,7 +394,7 @@ func BenchmarkDBGetByPrefix100(b *testing.B) {

 func BenchmarkDBGetByPrefix250(b *testing.B) {

 	var testSet []string

 	var testKeys []string

-	for i := 0; i < 250; i++ {

+	for range 250 {

 		testSet = append(testSet, stringid.GenerateRandomID())

 	}

 	db, err := NewViewDB()

@@ -421,7 +421,7 @@ func BenchmarkDBGetByPrefix250(b *testing.B) {

 func BenchmarkDBGetByPrefix500(b *testing.B) {

 	var testSet []string

 	var testKeys []string

-	for i := 0; i < 500; i++ {

+	for range 500 {

 		testSet = append(testSet, stringid.GenerateRandomID())

 	}

 	db, err := NewViewDB()

@@ -49,7 +49,7 @@ func BenchmarkImageList(b *testing.B) {

 		// Use constant seed for reproducibility

 		src := rand.NewSource(1982731263716)

-		for i := 0; i < count; i++ {

+		for i := range count {

 			platform := platforms.DefaultSpec()

 			// 20% is other architecture than the host

@@ -73,7 +73,7 @@ func BenchmarkImageList(b *testing.B) {

 				}

 				containersCount := r2 % maxContainerCount

-				for j := 0; j < containersCount; j++ {

+				for range containersCount {

 					id := digest.FromString(desc.Name + strconv.Itoa(i)).String()

 					target := desc.Target

@@ -74,7 +74,7 @@ func TestEventsLogTimeout(t *testing.T) {

 func TestLogEvents(t *testing.T) {

 	e := New()

-	for i := 0; i < eventsLimit+16; i++ {

+	for i := range eventsLimit + 16 {

 		num := strconv.Itoa(i)

 		e.Log(events.Action("action_"+num), events.ContainerEventType, events.Actor{

 			ID:         "cont_" + num,

@@ -83,7 +83,7 @@ func TestLogEvents(t *testing.T) {

 	}

 	time.Sleep(50 * time.Millisecond)

 	current, l, _ := e.Subscribe()

-	for i := 0; i < 10; i++ {

+	for i := range 10 {

 		num := strconv.Itoa(i + eventsLimit + 16)

 		e.Log(events.Action("action_"+num), events.ContainerEventType, events.Actor{

 			ID:         "cont_" + num,

@@ -77,7 +77,7 @@ func TestCopyDir(t *testing.T) {

 }

 func randomMode(baseMode int) os.FileMode {

-	for i := 0; i < 7; i++ {

+	for i := range 7 {

 		baseMode = baseMode | (1&rand.Intn(2))<<uint(i)

 	}

 	return os.FileMode(baseMode)

@@ -90,7 +90,7 @@ func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {

 	aTime := time.Unix(rand.Int63(), 0)

 	mTime := time.Unix(rand.Int63(), 0)

-	for i := 0; i < 10; i++ {

+	for i := range 10 {

 		dirName := filepath.Join(srcDir, fmt.Sprintf("srcdir-%d", i))

 		// Owner all bits set

 		assert.NilError(t, os.Mkdir(dirName, randomMode(0o700)))

@@ -98,7 +98,7 @@ func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {

 		assert.NilError(t, system.Chtimes(dirName, aTime, mTime))

 	}

-	for i := 0; i < 10; i++ {

+	for i := range 10 {

 		fileName := filepath.Join(srcDir, fmt.Sprintf("srcfile-%d", i))

 		// Owner read bit set

 		assert.NilError(t, os.WriteFile(fileName, []byte{}, randomMode(0o400)))

@@ -97,7 +97,7 @@ func TestV2MetadataService(t *testing.T) {

 func randomDigest() digest.Digest {

 	b := [32]byte{}

-	for i := 0; i < len(b); i++ {

+	for i := range len(b) {

 		b[i] = byte(rand.Intn(256))

 	}

 	d := hex.EncodeToString(b[:])

@@ -193,7 +193,7 @@ func BenchmarkBytesPipeWrite(b *testing.B) {

 				_, err = buf.Read(readBuf)

 			}

 		}()

-		for j := 0; j < 1000; j++ {

+		for range 1000 {

 			_, _ = buf.Write(testData)

 		}

 		_ = buf.Close()

@@ -206,11 +206,11 @@ func BenchmarkBytesPipeRead(b *testing.B) {

 	for b.Loop() {

 		b.StopTimer()

 		buf := New()

-		for j := 0; j < 500; j++ {

+		for range 500 {

 			_, _ = buf.Write(make([]byte, 1024))

 		}

 		b.StartTimer()

-		for j := 0; j < 1000; j++ {

+		for range 1000 {

 			if n, _ := buf.Read(rd); n != 512 {

 				b.Fatalf("Wrong number of bytes: %d", n)

 			}

@@ -130,7 +130,7 @@ func TestRaceUnbuffered(t *testing.T) {

 func BenchmarkUnbuffered(b *testing.B) {

 	writer := new(unbuffered)

 	setUpWriter := func() {

-		for i := 0; i < 100; i++ {

+		for range 100 {

 			writer.Add(devNullCloser(0))

 			writer.Add(devNullCloser(0))

 			writer.Add(devNullCloser(0))

@@ -138,7 +138,7 @@ func BenchmarkUnbuffered(b *testing.B) {

 	}

 	testLine := "Line that thinks that it is log line from docker"

 	var buf bytes.Buffer

-	for i := 0; i < 100; i++ {

+	for range 100 {

 		buf.WriteString(testLine + "\n")

 	}

 	// line without eol

@@ -151,7 +151,7 @@ func BenchmarkUnbuffered(b *testing.B) {

 		setUpWriter()

 		b.StartTimer()

-		for j := 0; j < 5; j++ {

+		for range 5 {

 			if _, err := writer.Write(testText); err != nil {

 				b.Fatal(err)

 			}

@@ -17,7 +17,7 @@ func compare(v1, v2 string) int {

 	)

 	maxVer := max(len(otherTab), len(currTab))

-	for i := 0; i < maxVer; i++ {

+	for i := range maxVer {

 		var currInt, otherInt int

 		if len(currTab) > i {

@@ -923,7 +923,7 @@ func TestMethods(t *testing.T) {

 		t.Fatalf("Unexpected sequence string: %s", hnd.head.toString())

 	}

-	for i := 0; i < 192; i++ {

+	for range 192 {

 		_, err := hnd.SetAny(false)

 		if err != nil {

 			t.Fatal(err)

@@ -1185,7 +1185,7 @@ func TestMarshalJSON(t *testing.T) {

 	hnd := New(uint64(len(expected) * 8))

 	for i, c := range expected {

-		for j := 0; j < 8; j++ {

+		for j := range 8 {

 			if c&(1<<j) == 0 {

 				continue

 			}

@@ -283,7 +283,7 @@ func checkTable(ctx context.Context, ips []string, port, networkName, tableName

 func waitWriters(parallelWriters int, mustWrite bool, doneCh chan resultTuple) map[string]int {

 	var totalKeys int

 	resultTable := make(map[string]int)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		log.G(context.TODO()).Infof("Waiting for %d workers", parallelWriters-i)

 		workerReturn := <-doneCh

 		totalKeys += workerReturn.result

@@ -337,7 +337,7 @@ func doClusterPeers(ips []string, args []string) {

 	doneCh := make(chan resultTuple, len(ips))

 	expectedPeers, _ := strconv.Atoi(args[0])

 	maxRetry, _ := strconv.Atoi(args[1])

-	for retry := 0; retry < maxRetry; retry++ {

+	for retry := range maxRetry {

 		// check all the nodes

 		for _, ip := range ips {

 			go clusterPeersNumber(ip, servicePort, doneCh)

@@ -398,7 +398,7 @@ func doNetworkPeers(ips []string, args []string) {

 	networkName := args[0]

 	expectedPeers, _ := strconv.Atoi(args[1])

 	maxRetry, _ := strconv.Atoi(args[2])

-	for retry := 0; retry < maxRetry; retry++ {

+	for retry := range maxRetry {

 		// check all the nodes

 		for _, ip := range ips {

 			go networkPeersNumber(ip, servicePort, networkName, doneCh)

@@ -469,14 +469,14 @@ func doWriteKeys(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	// Enable watch of tables from clients

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		go clientWatchTable(ips[i], servicePort, networkName, tableName, doneCh)

 	}

 	waitWriters(parallelWriters, false, doneCh)

 	// Start parallel writers that will create and delete unique keys

 	defer close(doneCh)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(context.TODO()).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeKeysNumber(ips[i], servicePort, networkName, tableName, key, numberOfKeys, doneCh)

@@ -502,14 +502,14 @@ func doDeleteKeys(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	// Enable watch of tables from clients

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		go clientWatchTable(ips[i], servicePort, networkName, tableName, doneCh)

 	}

 	waitWriters(parallelWriters, false, doneCh)

 	// Start parallel writers that will create and delete unique keys

 	defer close(doneCh)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(context.TODO()).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go deleteKeysNumber(ips[i], servicePort, networkName, tableName, key, numberOfKeys, doneCh)

@@ -535,14 +535,14 @@ func doWriteDeleteUniqueKeys(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	// Enable watch of tables from clients

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		go clientWatchTable(ips[i], servicePort, networkName, tableName, doneCh)

 	}

 	waitWriters(parallelWriters, false, doneCh)

 	// Start parallel writers that will create and delete unique keys

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeDeleteUniqueKeys(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -572,7 +572,7 @@ func doWriteUniqueKeys(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	// Enable watch of tables from clients

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		go clientWatchTable(ips[i], servicePort, networkName, tableName, doneCh)

 	}

 	waitWriters(parallelWriters, false, doneCh)

@@ -580,7 +580,7 @@ func doWriteUniqueKeys(ips []string, args []string) {

 	// Start parallel writers that will create and delete unique keys

 	defer close(doneCh)

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeUniqueKeys(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -609,7 +609,7 @@ func doWriteDeleteLeaveJoin(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	defer close(doneCh)

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeDeleteLeaveJoin(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -638,7 +638,7 @@ func doWriteDeleteWaitLeaveJoin(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	defer close(doneCh)

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeDeleteUniqueKeys(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -650,7 +650,7 @@ func doWriteDeleteWaitLeaveJoin(ips []string, args []string) {

 	log.G(ctx).Infof("Written a total of %d keys on the cluster", keyMap[totalWrittenKeys])

 	// The writers will leave the network

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		log.G(ctx).Infof("worker leaveNetwork: %d on IP:%s", i, ips[i])

 		go leaveNetwork(ips[i], servicePort, networkName, doneCh)

 	}

@@ -660,7 +660,7 @@ func doWriteDeleteWaitLeaveJoin(ips []string, args []string) {

 	time.Sleep(100 * time.Millisecond)

 	// The writers will join the network

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		log.G(ctx).Infof("worker joinNetwork: %d on IP:%s", i, ips[i])

 		go joinNetwork(ips[i], servicePort, networkName, doneCh)

 	}

@@ -684,7 +684,7 @@ func doWriteWaitLeave(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	defer close(doneCh)

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeUniqueKeys(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -696,7 +696,7 @@ func doWriteWaitLeave(ips []string, args []string) {

 	log.G(ctx).Infof("Written a total of %d keys on the cluster", keyMap[totalWrittenKeys])

 	// The writers will leave the network

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		log.G(ctx).Infof("worker leaveNetwork: %d on IP:%s", i, ips[i])

 		go leaveNetwork(ips[i], servicePort, networkName, doneCh)

 	}

@@ -721,7 +721,7 @@ func doWriteWaitLeaveJoin(ips []string, args []string) {

 	doneCh := make(chan resultTuple, parallelWriters)

 	defer close(doneCh)

 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(writeTimeSec)*time.Second)

-	for i := 0; i < parallelWriters; i++ {

+	for i := range parallelWriters {

 		key := "key-" + strconv.Itoa(i) + "-"

 		log.G(ctx).Infof("Spawn worker: %d on IP:%s", i, ips[i])

 		go writeUniqueKeys(ctx, ips[i], servicePort, networkName, tableName, key, doneCh)

@@ -734,7 +734,7 @@ func doWriteWaitLeaveJoin(ips []string, args []string) {

 	keysExpected := keyMap[totalWrittenKeys]

 	// The Leavers will leave the network

-	for i := 0; i < parallelLeaver; i++ {

+	for i := range parallelLeaver {

 		log.G(ctx).Infof("worker leaveNetwork: %d on IP:%s", i, ips[i])

 		go leaveNetwork(ips[i], servicePort, networkName, doneCh)

 		// Once a node leave all the keys written previously will be deleted, so the expected keys will consider that as removed

@@ -746,7 +746,7 @@ func doWriteWaitLeaveJoin(ips []string, args []string) {

 	time.Sleep(100 * time.Millisecond)

 	// The writers will join the network

-	for i := 0; i < parallelLeaver; i++ {

+	for i := range parallelLeaver {

 		log.G(ctx).Infof("worker joinNetwork: %d on IP:%s", i, ips[i])

 		go joinNetwork(ips[i], servicePort, networkName, doneCh)

 	}

@@ -211,7 +211,7 @@ func compareBindings(a, b []portmapperapi.PortBinding) bool {

 	if len(a) != len(b) {

 		return false

 	}

-	for i := 0; i < len(a); i++ {

+	for i := range a {

 		if !comparePortBinding(&a[i].PortBinding, &b[i].PortBinding) {

 			return false

 		}

@@ -1250,7 +1250,7 @@ func TestCreateParallel(t *testing.T) {

 	ipV4Data := getIPv4Data(t)

 	ch := make(chan error, 100)

-	for i := 0; i < 100; i++ {

+	for i := range 100 {

 		name := "net" + strconv.Itoa(i)

 		c.Go(t, func() {

 			config := &networkConfiguration{BridgeName: name, EnableIPv4: true}

@@ -1269,7 +1269,7 @@ func TestCreateParallel(t *testing.T) {

 	}

 	// wait for the go routines

 	var success int

-	for i := 0; i < 100; i++ {

+	for range 100 {

 		val := <-ch

 		if val == nil {

 			success++

@@ -371,7 +371,7 @@ func TestConcurrentWrites(t *testing.T) {

 	}

 	group := new(errgroup.Group)

-	for i := byte(0); i < 10; i++ {

+	for i := range byte(10) {

 		group.Go(func() error {

 			addr, ok := netip.AddrFromSlice([]byte{i, i, i, i})

 			assert.Assert(t, ok)

@@ -382,7 +382,7 @@ func TestConcurrentWrites(t *testing.T) {

 				},

 			}

-			for j := 0; j < 25; j++ {

+			for range 25 {

 				if err := Add(file.Name(), rec); err != nil {

 					return err

 				}

@@ -429,7 +429,7 @@ func benchDelete(b *testing.B) {

 	var records []Record

 	var toDelete []Record

-	for i := byte(0); i < 255; i++ {

+	for i := range byte(255) {

 		addr, ok := netip.AddrFromSlice([]byte{i, i, i, i})

 		assert.Assert(b, ok)

 		record := Record{

@@ -1099,7 +1099,7 @@ func testAllocateRandomDeallocate(t *testing.T, pool, subPool string, num int, s

 	// Allocate num ip addresses

 	indices := make(map[int]*net.IPNet, num)

 	allocated := make(map[string]bool, num)

-	for i := 0; i < num; i++ {

+	for i := range num {

 		ip, _, err := a.RequestAddress(alloc.PoolID, nil, nil)

 		if err != nil {

 			t.Fatal(err)

@@ -1202,7 +1202,7 @@ func runParallelTests(t *testing.T, instance int) {

 	if instance == first {

 		done.Wait()

 		// Now check each instance got a different pool

-		for i := 0; i < numInstances; i++ {

+		for i := range numInstances {

 			for j := i + 1; j < numInstances; j++ {

 				if types.CompareIPNet(pools[i], pools[j]) {

 					t.Errorf("Instance %d and %d were given the same predefined pool: %v", i, j, pools)

@@ -1240,7 +1240,7 @@ func TestRequestReleaseAddressDuplicate(t *testing.T) {

 	group, ctx := errgroup.WithContext(context.Background())

 outer:

-	for n := 0; n < 10000; n++ {

+	for range 10000 {

 		var c *net.IPNet

 		for {

 			select {

@@ -75,7 +75,7 @@ func TestRequestPoolParallel(t *testing.T) {

 	imax := 1 << (a.local4.predefined[0].Size - a.local4.predefined[0].Base.Bits())

 	allocCh := make(chan string, imax)

-	for i := 0; i < imax; i++ {

+	for i := range imax {

 		expected = append(expected, fmt.Sprintf("10.%d.%d.0/24", uint(i/256), i%256))

 		eg.Go(func() error {

@@ -177,7 +177,7 @@ func allocate(t *testing.T, tctx *testContext, parallel int64) {

 	wg.Wait()

 	// process results

-	for i := 0; i < routineNum; i++ {

+	for range routineNum {

 		ip := <-ch

 		if ip == nil {

 			continue

@@ -137,7 +137,7 @@ func TestConcurrencyWithWait(t *testing.T) {

 	proto := "tcp"

 	group := new(errgroup.Group)

-	for i := 0; i < 10; i++ {

+	for range 10 {

 		group.Go(func() error {

 			return addSomeRules(natChain, ip, port, proto, dstAddr, dstPort)

 		})

@@ -249,7 +249,7 @@ func compareIpamConfList(listA, listB []*IpamConf) bool {

 	if len(listA) != len(listB) {

 		return false

 	}

-	for i := 0; i < len(listA); i++ {

+	for i := range listA {

 		a = listA[i]

 		b = listB[i]

 		if a.PreferredPool != b.PreferredPool ||

@@ -266,7 +266,7 @@ func compareIpamInfoList(listA, listB []*IpamInfo) bool {

 	if len(listA) != len(listB) {

 		return false

 	}

-	for i := 0; i < len(listA); i++ {

+	for i := range listA {

 		a = listA[i]

 		b = listB[i]

 		if a.PoolID != b.PoolID || !compareStringMaps(a.Meta, b.Meta) ||

@@ -117,7 +117,7 @@ func queryOnLinkRoutes() []netip.Prefix {

 // prefix and the length of random bytes. The api ensures that the

 // there is no interface which exists with that name.

 func GenerateIfaceName(nlh nlwrap.Handle, prefix string, length int) (string, error) {

-	for i := 0; i < 3; i++ {

+	for range 3 {

 		name, err := GenerateRandomName(prefix, length)

 		if err != nil {

 			return "", err

@@ -51,7 +51,7 @@ func launchNode(t TestingT, conf Config) *NetworkDB {

 func createNetworkDBInstances(t TestingT, num int, namePrefix string, conf *Config) []*NetworkDB {

 	t.Helper()

 	var dbs []*NetworkDB

-	for i := 0; i < num; i++ {

+	for i := range num {

 		localConfig := *conf

 		localConfig.Hostname = fmt.Sprintf("%s%d", namePrefix, i+1)

 		localConfig.NodeID = stringid.TruncateID(stringid.GenerateRandomID())

@@ -69,7 +69,7 @@ func createNetworkDBInstances(t TestingT, num int, namePrefix string, conf *Conf

 	// Wait till the cluster creation is successful

 	check := func(t poll.LogT) poll.Result {

 		// Check that the cluster is properly created

-		for i := 0; i < num; i++ {

+		for i := range num {

 			if num != len(dbs[i].ClusterPeers()) {

 				return poll.Continue("%s:Waiting for cluster peers to be established", dbs[i].config.Hostname)

 			}

@@ -91,7 +91,7 @@ func closeNetworkDBInstances(t TestingT, dbs []*NetworkDB) {

 func (nDB *NetworkDB) verifyNodeExistence(t *testing.T, node string, present bool) {

 	t.Helper()

-	for i := 0; i < 80; i++ {

+	for range 80 {

 		nDB.RLock()

 		_, ok := nDB.nodes[node]

 		nDB.RUnlock()

@@ -154,7 +154,7 @@ func (nDB *NetworkDB) verifyEntryExistence(t *testing.T, tname, nid, key, value

 	t.Helper()

 	n := 80

 	var v []byte

-	for i := 0; i < n; i++ {

+	for range n {

 		var err error

 		v, err = nDB.GetEntry(tname, nid, key)

 		if present && err == nil && string(v) == value {

@@ -485,8 +485,8 @@ func TestNetworkDBCRUDMediumCluster(t *testing.T) {

 		}(db)

 	}

-	for i := 0; i < n; i++ {

-		for j := 0; j < n; j++ {

+	for i := range n {

+		for j := range n {

 			if i == j {

 				continue

 			}

@@ -495,13 +495,13 @@ func TestNetworkDBCRUDMediumCluster(t *testing.T) {

 		}

 	}

-	for i := 0; i < n; i++ {

+	for i := range n {

 		err := dbs[i].JoinNetwork("network1")

 		assert.NilError(t, err)

 	}

-	for i := 0; i < n; i++ {

-		for j := 0; j < n; j++ {

+	for i := range n {

+		for j := range n {

 			dbs[i].verifyNetworkExistence(t, dbs[j].config.NodeID, "network1", true)

 		}

 	}

@@ -627,16 +627,16 @@ func TestNetworkDBGarbageCollection(t *testing.T) {

 	err = dbs[1].JoinNetwork("network1")

 	assert.NilError(t, err)

-	for i := 0; i < keysWriteDelete; i++ {

+	for i := range keysWriteDelete {

 		err = dbs[i%2].CreateEntry("testTable", "network1", "key-"+strconv.Itoa(i), []byte("value"))

 		assert.NilError(t, err)

 	}

 	time.Sleep(time.Second)

-	for i := 0; i < keysWriteDelete; i++ {

+	for i := range keysWriteDelete {

 		err = dbs[i%2].DeleteEntry("testTable", "network1", "key-"+strconv.Itoa(i))

 		assert.NilError(t, err)

 	}

-	for i := 0; i < 2; i++ {

+	for i := range 2 {

 		dbs[i].Lock()

 		assert.Check(t, is.Equal(int64(keysWriteDelete), dbs[i].thisNodeNetworks["network1"].entriesNumber.Load()), "entries number should match")

 		dbs[i].Unlock()

@@ -647,14 +647,14 @@ func TestNetworkDBGarbageCollection(t *testing.T) {

 	err = dbs[2].JoinNetwork("network1")

 	assert.NilError(t, err)

-	for i := 0; i < 3; i++ {

+	for i := range 3 {

 		dbs[i].Lock()

 		assert.Check(t, is.Equal(int64(keysWriteDelete), dbs[i].thisNodeNetworks["network1"].entriesNumber.Load()), "entries number should match")

 		dbs[i].Unlock()

 	}

 	// at this point the entries should had been all deleted

 	time.Sleep(30 * time.Second)

-	for i := 0; i < 3; i++ {

+	for i := range 3 {

 		dbs[i].Lock()

 		assert.Check(t, is.Equal(int64(0), dbs[i].thisNodeNetworks["network1"].entriesNumber.Load()), "entries should had been garbage collected")

 		dbs[i].Unlock()

@@ -662,7 +662,7 @@ func TestNetworkDBGarbageCollection(t *testing.T) {

 	// make sure that entries are not coming back

 	time.Sleep(15 * time.Second)

-	for i := 0; i < 3; i++ {

+	for i := range 3 {

 		dbs[i].Lock()

 		assert.Check(t, is.Equal(int64(0), dbs[i].thisNodeNetworks["network1"].entriesNumber.Load()), "entries should had been garbage collected")

 		dbs[i].Unlock()

@@ -832,7 +832,7 @@ func TestParallelCreate(t *testing.T) {

 	startCh := make(chan int)

 	doneCh := make(chan error)

 	var success atomic.Uint32

-	for i := 0; i < 20; i++ {

+	for range 20 {

 		go func() {

 			<-startCh

 			err := dbs[0].CreateEntry("testTable", "testNetwork", "key", []byte("value"))

@@ -845,7 +845,7 @@ func TestParallelCreate(t *testing.T) {

 	close(startCh)

-	for i := 0; i < 20; i++ {

+	for range 20 {

 		<-doneCh

 	}

 	close(doneCh)

@@ -864,7 +864,7 @@ func TestParallelDelete(t *testing.T) {

 	startCh := make(chan int)

 	doneCh := make(chan error)

 	var success atomic.Uint32

-	for i := 0; i < 20; i++ {

+	for range 20 {

 		go func() {

 			<-startCh

 			err := dbs[0].DeleteEntry("testTable", "testNetwork", "key")

@@ -877,7 +877,7 @@ func TestParallelDelete(t *testing.T) {

 	close(startCh)

-	for i := 0; i < 20; i++ {

+	for range 20 {

 		<-doneCh

 	}

 	close(doneCh)

@@ -923,7 +923,7 @@ func TestNetworkDBIslands(t *testing.T) {

 	}

 	// Now the 3 bootstrap nodes will cleanly leave, and will be properly removed from the other 2 nodes

-	for i := 0; i < 3; i++ {

+	for i := range 3 {

 		log.G(t.Context()).Infof("node %d leaving", i)

 		dbs[i].Close()

 	}

@@ -958,7 +958,7 @@ func TestNetworkDBIslands(t *testing.T) {

 	poll.WaitOn(t, check, poll.WithDelay(time.Second), poll.WithTimeout(pollTimeout()))

 	// Spawn again the first 3 nodes with different names but same IP:port

-	for i := 0; i < 3; i++ {

+	for i := range 3 {

 		log.G(t.Context()).Infof("node %d coming back", i)

 		conf := *dbs[i].config

 		conf.NodeID = stringid.TruncateID(stringid.GenerateRandomID())

@@ -968,7 +968,7 @@ func TestNetworkDBIslands(t *testing.T) {

 	// Give some time for the reconnect routine to run, it runs every 6s.

 	check = func(t poll.LogT) poll.Result {

 		// Verify that the cluster is again all connected. Note that the 3 previous node did not do any join

-		for i := 0; i < 5; i++ {

+		for i := range 5 {

 			db := dbs[i]

 			db.RLock()

 			if len(db.nodes) != 5 {

@@ -57,7 +57,7 @@ func (nlh Handle) Close() {

 }

 func retryOnIntr(f func() error) {

-	for attempt := 0; attempt < maxAttempts; attempt++ {

+	for range maxAttempts {

 		if err := f(); !errors.Is(err, netlink.ErrDumpInterrupted) {

 			return

 		}

@@ -37,7 +37,7 @@ func (d deviceFlags) String() string {

 		unknown uint32

 	)

-	for i := uint(0); i < 32; i++ {

+	for i := range uint(32) {

 		if d&(1<<i) != 0 {

 			if s, ok := deviceFlagStrings[deviceFlags(1<<i)]; ok {

 				flags = append(flags, s)

@@ -37,12 +37,12 @@ const (

 // Generates i multi-line events each with j lines

 func (l *logStream) logGenerator(lineCount int, multilineCount int) {

-	for i := 0; i < multilineCount; i++ {

+	for range multilineCount {

 		l.Log(&logger.Message{

 			Line:      []byte(multilineLogline),

 			Timestamp: time.Time{},

 		})

-		for j := 0; j < lineCount; j++ {

+		for range lineCount {

 			l.Log(&logger.Message{

 				Line:      []byte(logline),

 				Timestamp: time.Time{},

@@ -1288,7 +1288,7 @@ func TestCollectBatchMaxTotalBytes(t *testing.T) {

 	// no ticks, guarantee batch by size (and chan close)

 	stream.Close()

-	for i := 0; i < expectedPuts; i++ {

+	for range expectedPuts {

 		<-called

 	}

 	assert.Assert(t, len(calls) == expectedPuts)

@@ -1364,7 +1364,7 @@ func TestCollectBatchMaxTotalBytesWithBinary(t *testing.T) {

 	// no ticks, guarantee batch by size (and chan close)

 	stream.Close()

-	for i := 0; i < expectedPuts; i++ {

+	for range expectedPuts {

 		<-called

 	}

 	assert.Assert(t, len(calls) == expectedPuts)

@@ -1422,7 +1422,7 @@ func TestCollectBatchWithDuplicateTimestamps(t *testing.T) {

 	var expectedEvents []types.InputLogEvent

 	times := maximumLogEventsPerPut

 	timestamp := time.Now()

-	for i := 0; i < times; i++ {

+	for i := range times {

 		line := strconv.Itoa(i)

 		if i%2 == 0 {

 			timestamp = timestamp.Add(1 * time.Nanosecond)

@@ -1446,7 +1446,7 @@ func TestCollectBatchWithDuplicateTimestamps(t *testing.T) {

 	close(called)

 	assert.Assert(t, argument != nil)

 	assert.Assert(t, len(argument.LogEvents) == times)

-	for i := 0; i < times; i++ {

+	for i := range times {

 		if !reflect.DeepEqual(argument.LogEvents[i], expectedEvents[i]) {

 			t.Errorf("Expected event to be %v but was %v", expectedEvents[i], argument.LogEvents[i])

 		}

@@ -1659,7 +1659,7 @@ func TestCreateTagSuccess(t *testing.T) {

 func BenchmarkUnwrapEvents(b *testing.B) {

 	events := make([]wrappedEvent, maximumLogEventsPerPut)

-	for i := 0; i < maximumLogEventsPerPut; i++ {

+	for i := range maximumLogEventsPerPut {

 		mes := strings.Repeat("0", maximumBytesPerEvent)

 		events[i].inputLogEvent = types.InputLogEvent{

 			Message: &mes,

@@ -57,7 +57,7 @@ func TestCopier(t *testing.T) {

 	var stdout bytes.Buffer

 	var stderr bytes.Buffer

-	for i := 0; i < 30; i++ {

+	for range 30 {

 		if _, err := stdout.WriteString(stdoutLine + "\n"); err != nil {

 			t.Fatal(err)

 		}

@@ -131,7 +131,7 @@ func TestCopierLongLines(t *testing.T) {

 	var stdout bytes.Buffer

 	var stderr bytes.Buffer

-	for i := 0; i < 3; i++ {

+	for range 3 {

 		if _, err := stdout.WriteString(stdoutLongLine); err != nil {

 			t.Fatal(err)

 		}

@@ -196,7 +196,7 @@ func TestCopierLongLines(t *testing.T) {

 func TestCopierSlow(t *testing.T) {

 	stdoutLine := "Line that thinks that it is log line from docker stdout"

 	var stdout bytes.Buffer

-	for i := 0; i < 30; i++ {

+	for range 30 {

 		if _, err := stdout.WriteString(stdoutLine + "\n"); err != nil {

 			t.Fatal(err)

 		}

@@ -300,7 +300,7 @@ func TestCopierWithPartial(t *testing.T) {

 	var stderr bytes.Buffer

 	var normalMsg bytes.Buffer

-	for i := 0; i < 3; i++ {

+	for range 3 {

 		if _, err := stdout.WriteString(stdoutLongLine); err != nil {

 			t.Fatal(err)

 		}

@@ -479,7 +479,7 @@ func piped(b *testing.B, iterations int, delay time.Duration, buf []byte) io.Rea

 		return nil

 	}

 	go func() {

-		for i := 0; i < iterations; i++ {

+		for range iterations {

 			time.Sleep(delay)

 			if n, err := w.Write(buf); err != nil || n != len(buf) {

 				if err != nil {

@@ -168,7 +168,7 @@ func TestJSONFileLoggerWithOpts(t *testing.T) {

 		t.Fatal(err)

 	}

 	defer l.Close()

-	for i := 0; i < 36; i++ {

+	for i := range 36 {

 		if err := l.Log(&logger.Message{Line: []byte("line" + strconv.Itoa(i)), Source: "src1"}); err != nil {

 			t.Fatal(err)

 		}

@@ -98,7 +98,7 @@ type decoder struct {

 func (d *decoder) readRecord(size int) error {

 	var err error

-	for i := 0; i < maxDecodeRetry; i++ {

+	for range maxDecodeRetry {

 		var n int

 		n, err = io.ReadFull(d.rdr, d.buf[d.offset:size])

 		d.offset += n

@@ -43,7 +43,7 @@ func TestLog(t *testing.T) {

 	defer l.Close()

 	var messages []logger.Message

-	for i := 0; i < 100; i++ {