chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334)

Signed-off-by: Charly Molter <charly.molter@konghq.com>

.github/workflows/golangci-lint.yml

@@ -19,5 +19,9 @@ jobs:
           go-version: 1.21.1
       - uses: golangci/golangci-lint-action@v3
         with:
+<<<<<<< HEAD
           args: --fix=false --verbose
+=======
+          args: --verbose
+>>>>>>> 409438fbc (chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334))
           version: v1.53.3

mk/dependencies/deps.lock

@@ -1 +1,5 @@
+<<<<<<< HEAD
 fd330db85722e0d89048286f2b9be76e0f6465d2
+=======
+ddcb18fef158bd55f6534f1a4ab75af4f9db3b6f
+>>>>>>> 409438fbc (chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334))

mk/dev.mk

@@ -21,7 +21,11 @@ CI_TOOLS_BIN_DIR=$(CI_TOOLS_DIR)/bin
 # Change here and `make check` ensures these are used for CI
 K8S_MIN_VERSION = v1.23.17-k3s1
 K8S_MAX_VERSION = v1.27.1-k3s1
+<<<<<<< HEAD
 export GO_VERSION=1.21.1
+=======
+export GO_VERSION=1.20.5
+>>>>>>> 409438fbc (chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334))
 export GOLANGCI_LINT_VERSION=v1.53.3
 GOOS := $(shell go env GOOS)
 GOARCH := $(shell go env GOARCH)

test/e2e_env/universal/meshretry/http.go

@@ -108,6 +108,18 @@ spec:
 				client.WithMaxTime(8),
 			)
 			g.Expect(err).ToNot(HaveOccurred())
+<<<<<<< HEAD
 		}, "1m", "1s", MustPassRepeatedly(5)).Should(Succeed())
+=======
+		}).Should(Succeed())
+		Consistently(func(g Gomega) {
+			// --max-time 8 to wait for 8 seconds to beat the default 5s connect timeout
+			_, err := client.CollectEchoResponse(
+				universal.Cluster, "demo-client", "test-server.mesh",
+				client.WithMaxTime(8),
+			)
+			g.Expect(err).ToNot(HaveOccurred())
+		}).Should(Succeed())
+>>>>>>> 409438fbc (chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334))
 	})
 }