Merge pull request #1 from aeraki-mesh/master

Merge官方最新代码

.ci/yamllint.yml

@@ -6,6 +6,7 @@ ignore: |
   manifests/charts/aeraki/templates/deployment.yaml
   manifests/charts/aeraki/templates/service.yaml
   manifests/charts/aeraki/templates/serviceaccount.yaml
+  manifests/charts/aeraki/templates/tcmapiservice.yaml
   k8s/crd.yaml
 
 yaml-files:

.github/workflows/ci.yaml

@@ -1,6 +1,20 @@
 ---
 name: ci
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - "master"
+    - "release/v*"
+    paths-ignore:
+    - "**/*.png"
+    - "**/*.md"
+  pull_request:
+    branches:
+    - "master"
+    - "release/v*"
+    paths-ignore:
+    - "**/*.png"
+    - "**/*.md"
 jobs:
   yamllint:
     name: yamllint
@@ -14,19 +28,19 @@ jobs:
           config_file: .ci/yamllint.yml
           strict: true
   build-and-test:
-    name: build and test
+    name: build-and-test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: Build
-        run: go build -race  ./...
+        run: go build -race  ./internal/...
       - name: Test
-        run: go test -race  `go list ./... | grep -v e2e`
+        run: go test -race  `go list ./internal/... | grep -v e2e`
   go-lint:
     name: go-lint
     runs-on: ubuntu-latest
@@ -36,39 +50,40 @@ jobs:
       - name: golint
         uses: Jerome1337/golint-action@v1.0.2
         with:
-          golint-path: './...'
+          golint-path: './internal/...'
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.1.0
         with:
           args: --timeout=10m --tests="false"
+          version: v1.47.0
   style-check:
-    name: gofmt and goimports
+    name: style-check
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: Install dependencies
         run: |
           go version
-          go get golang.org/x/tools/cmd/goimports
+          go install golang.org/x/tools/cmd/goimports@latest
       - name: gofmt and goimports
         run: make style-check
   checkgomod:
-    name: check go.mod and go.sum
+    name: go-mod-check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.16
+          go-version: 1.19
       - run: go mod tidy
       - name: Check for changes in go.mod or go.sum
         run: |

.github/workflows/e2e-kafka-zookeeper.yaml → .github/workflows/e2e-metaprotocol-gateway.yaml

@@ -1,40 +1,55 @@
 ---
-name: e2e-kafka-zookeeper
+name: e2e-metaprotocolgateway
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - "master"
+    - "release/v*"
+    paths-ignore:
+    - "**/*.png"
+    - "**/*.md"
+  pull_request:
+    branches:
+    - "master"
+    - "release/v*"
+    paths-ignore:
+    - "**/*.png"
+    - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.10.0
+  ISTIO_VERSION: 1.16.5
+  ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common
-
+  AERAKI_IMG_PULL_POLICY: Never
 jobs:
-  test:
+  TestGatewayVersionRouting:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       fail-fast: true
-    name: e2e-test
+    name: TestGatewayVersionRouting
     steps:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: Install dependencies
         run: |
           go version
-          go get golang.org/x/tools/cmd/goimports
+          go install golang.org/x/tools/cmd/goimports@latest
       - name: build docker
         run: make docker-build-e2e
       - name: Prepare envrionment
         run: bash ${SCRIPTS_DIR}/pre.sh
       - name: Install Minikube
         run: bash ${SCRIPTS_DIR}/minikube.sh start
       - name: Install Istio
-        run: bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml
+        run: bash ${SCRIPTS_DIR}/istio.sh
       - name: Install aeraki
         run: bash ${SCRIPTS_DIR}/aeraki.sh
       - name: test
-        run: make e2e-kafka-zookeeper
+        run: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocolgateway/ -run TestThriftRouter