From d19ece1002e97c53429ad3d5c27294e698448145 Mon Sep 17 00:00:00 2001
From: Istio Automation <istio-testing-bot@google.com>
Date: Thu, 22 Sep 2022 12:52:41 -0700
Subject: [PATCH] Automator: update common-files@master in istio/proxy@master
 (#4075)

---
 common/.commonfiles.sha            | 2 +-
 common/config/.golangci-format.yml | 2 +-
 common/config/.golangci.yml        | 6 ++----
 common/scripts/kind_provisioner.sh | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6b918fe01b8..7628ae66fd5 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-c2f65513cc37a8d42e699be6f09d5c09fe868325
+2eb9688855b32f69186351bfef43fceb086125ac
diff --git a/common/config/.golangci-format.yml b/common/config/.golangci-format.yml
index 7f9c313fc66..b94c58396d1 100644
--- a/common/config/.golangci-format.yml
+++ b/common/config/.golangci-format.yml
@@ -7,7 +7,7 @@
 
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the istio/tools repo.
-  golangci-lint-version: 1.38.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.49.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml
index 76568bf8185..f8ad9a82af0 100644
--- a/common/config/.golangci.yml
+++ b/common/config/.golangci.yml
@@ -7,7 +7,7 @@
 
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the istio/tools repo.
-  golangci-lint-version: 1.38.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.49.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
@@ -34,7 +34,6 @@ run:
 linters:
   disable-all: true
   enable:
-  - deadcode
   - errcheck
   - exportloopref
   - gocritic
@@ -47,12 +46,11 @@ linters:
   - lll
   - misspell
   - staticcheck
-  - structcheck
   - stylecheck
   - typecheck
   - unconvert
   - unparam
-  - varcheck
+  - unused
   - gci
   fast: false
 
diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh
index 0358dd103a2..1f2a7759c52 100644
--- a/common/scripts/kind_provisioner.sh
+++ b/common/scripts/kind_provisioner.sh
@@ -386,7 +386,7 @@ function install_metallb() {
 
   # Give this cluster of those IPs
   RANGE="["
-  for i in {0..9}; do
+  for i in {0..19}; do
     RANGE+="${METALLB_IPS4[1]},"
     METALLB_IPS4=("${METALLB_IPS4[@]:1}")
     if [[ "${#METALLB_IPS6[@]}" != 0 ]]; then