Upgrade istio dependencies to 1.18.1 (#385)

* upgrade istio dependencies to 1.18.1 * fix goimports * fix lint * fix test * address comments * fix lint * fix test * remove istio-1.18.2 directory * fix lint Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
aeraki-mesh · Aug 20, 2023 · 40fd51c · 40fd51c
1 parent b7439f7
commit 40fd51c
Show file tree

Hide file tree

Showing 43 changed files with 678 additions and 1,028 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Build
         run: go build -race  ./internal/...
       - name: Test
@@ -54,12 +54,11 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.1.0
+        uses: golangci/golangci-lint-action@v3.7.0
         with:
           args: --timeout=10m --tests="false"
-          version: v1.47.0
   style-check:
     name: style-check
     runs-on: ubuntu-latest
@@ -69,7 +68,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -83,7 +82,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - run: go mod tidy
       - name: Check for changes in go.mod or go.sum
         run: |

diff --git a/.github/workflows/e2e-metaprotocol-gateway.yaml b/.github/workflows/e2e-metaprotocol-gateway.yaml
@@ -18,7 +18,7 @@ on:
     - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.18.2
+  ISTIO_VERSION: 1.18.1
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version

diff --git a/.github/workflows/e2e-metaprotocol.yaml b/.github/workflows/e2e-metaprotocol.yaml
@@ -18,7 +18,7 @@ on:
     - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.18.2
+  ISTIO_VERSION: 1.18.1
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -65,7 +65,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -94,7 +94,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -123,7 +123,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -152,7 +152,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -181,7 +181,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -210,7 +210,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -239,7 +239,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version
@@ -268,7 +268,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go version

diff --git a/.github/workflows/e2e-redis.yaml b/.github/workflows/e2e-redis.yaml
@@ -18,7 +18,7 @@ on:
     - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.18.2
+  ISTIO_VERSION: 1.18.1
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Install dependencies
         run: |
           go install golang.org/x/tools/cmd/goimports@latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -15,13 +15,15 @@
 ---
 linters-settings:
   depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
+    rules:
+      Main:
+        deny:
+          - pkg: github.com/gogo/protobuf
+            desc: "gogo/protobuf is deprecated, use golang/protobuf"
+          - pkg: gopkg.in/yaml.v2
+            desc: "use sigs.k8s.io/yaml instead"
+          - pkg: gopkg.in/yaml.v3
+            desc: "use sigs.k8s.io/yaml instead"
   dupl:
     threshold: 100
   funlen:
@@ -80,39 +82,18 @@ linters-settings:
 linters:
   disable-all: true
   enable:
+    - stylecheck
     - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
-    - errcheck
     - exportloopref
-    - funlen
-    - gochecknoinits
-    - goconst
-    - gocritic
-    - gocyclo
     - gofmt
     - goimports
-    - goprintffuncname
+    - goheader
+    - gocritic
     - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - lll
     - misspell
-    - nakedret
-    - noctx
-    - nolintlint
-    - staticcheck
-    - structcheck
-    - stylecheck
-    - typecheck
+    - revive
     - unconvert
     - unparam
-    - unused
-    - varcheck
-    - whitespace
 
   # don't enable:
   # - asciicheck

diff --git a/Makefile b/Makefile
@@ -55,7 +55,6 @@ demo-brpc:
 uninstall-demo-brpc:
 	bash demo/uninstall-demo.sh brpc
 test: style-check
-	$(GOMOD) tidy
 	$(GOTEST) -race  `go list ./internal/... | grep -v e2e`
 build: test
 	CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)

diff --git a/cmd/aeraki/main.go b/cmd/aeraki/main.go
@@ -83,7 +83,6 @@ func main() {
 	server, err := bootstrap.NewServer(args)
 	if err != nil {
 		log.Fatalf("Failed to init Aeraki :%v", err)
-		os.Exit(1)
 	}
 	server.Start(stopChan)
 

diff --git a/demo/install-demo.sh b/demo/install-demo.sh
@@ -21,7 +21,7 @@ DEMO=$1
 SCRIPTS_DIR=$BASEDIR/test/e2e/scripts
 
 if [ -z "$AERAKI_TAG" ]; then
-  export AERAKI_TAG="1.4.0"
+  export AERAKI_TAG="1.4.1"
 fi
 bash ${SCRIPTS_DIR}/istio.sh
 bash ${SCRIPTS_DIR}/addons.sh

diff --git a/demo/metaprotocol-brpc/brpc-sample.yaml b/demo/metaprotocol-brpc/brpc-sample.yaml
@@ -28,7 +28,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: brpc-echo-server
         version: v1
@@ -57,7 +57,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: brpc-echo-server
         version: v2
@@ -86,7 +86,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: brpc-echo-client
     spec:

diff --git a/demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml b/demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml
@@ -40,7 +40,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-provider
         version: v1
@@ -76,7 +76,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-provider
         version: v2
@@ -112,7 +112,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-second-provider
         version: v2
@@ -139,7 +139,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-consumer
     spec:

diff --git a/demo/metaprotocol-dubbo/dubbo-sample.yaml b/demo/metaprotocol-dubbo/dubbo-sample.yaml
@@ -40,7 +40,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-provider
         version: v1
@@ -76,7 +76,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-provider
         version: v2
@@ -112,7 +112,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-second-provider
         version: v2
@@ -139,7 +139,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
       labels:
         app: dubbo-sample-consumer
     spec:

diff --git a/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml b/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml
@@ -29,7 +29,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
         sidecar.istio.io/rewriteAppHTTPProbers: "false"
       labels:
         app: thrift-sample-server

diff --git a/demo/metaprotocol-thrift/thrift-sample.yaml b/demo/metaprotocol-thrift/thrift-sample.yaml
@@ -28,7 +28,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
         sidecar.istio.io/rewriteAppHTTPProbers: "false"
       labels:
         app: thrift-sample-server
@@ -55,7 +55,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
         sidecar.istio.io/rewriteAppHTTPProbers: "false"
       labels:
         app: thrift-sample-server
@@ -82,7 +82,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
         sidecar.istio.io/rewriteAppHTTPProbers: "false"
       labels:
         app: thrift-sample-client