Skip to content

Commit 40fd51c

Browse files
zhaohuabingzhaohuabing
authored
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 <[email protected]>
1 parent b7439f7 commit 40fd51c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+678
-1028
lines changed

‎.github/workflows/ci.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go
3737
uses: actions/setup-go@v1
3838
with:
39-
go-version: 1.19
39+
go-version: '1.20'
4040
- name: Build
4141
run: go build -race ./internal/...
4242
- name: Test
@@ -54,12 +54,11 @@ jobs:
5454
- name: Setup Go
5555
uses: actions/setup-go@v1
5656
with:
57-
go-version: 1.19
57+
go-version: '1.20'
5858
- name: golangci-lint
59-
uses: golangci/golangci-lint-action@v3.1.0
59+
uses: golangci/golangci-lint-action@v3.7.0
6060
with:
6161
args: --timeout=10m --tests="false"
62-
version: v1.47.0
6362
style-check:
6463
name: style-check
6564
runs-on: ubuntu-latest
@@ -69,7 +68,7 @@ jobs:
6968
- name: Setup Go
7069
uses: actions/setup-go@v2
7170
with:
72-
go-version: 1.19
71+
go-version: '1.20'
7372
- name: Install dependencies
7473
run: |
7574
go version
@@ -83,7 +82,7 @@ jobs:
8382
- uses: actions/checkout@v2
8483
- uses: actions/setup-go@v1
8584
with:
86-
go-version: 1.19
85+
go-version: '1.20'
8786
- run: go mod tidy
8887
- name: Check for changes in go.mod or go.sum
8988
run: |

‎.github/workflows/e2e-metaprotocol-gateway.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- "**/*.md"
1919

2020
env:
21-
ISTIO_VERSION: 1.18.2
21+
ISTIO_VERSION: 1.18.1
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go
3737
uses: actions/setup-go@v2
3838
with:
39-
go-version: 1.19
39+
go-version: '1.20'
4040
- name: Install dependencies
4141
run: |
4242
go version

‎.github/workflows/e2e-metaprotocol.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- "**/*.md"
1919

2020
env:
21-
ISTIO_VERSION: 1.18.2
21+
ISTIO_VERSION: 1.18.1
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go
3737
uses: actions/setup-go@v2
3838
with:
39-
go-version: 1.19
39+
go-version: '1.20'
4040
- name: Install dependencies
4141
run: |
4242
go version
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup Go
6666
uses: actions/setup-go@v2
6767
with:
68-
go-version: 1.19
68+
go-version: '1.20'
6969
- name: Install dependencies
7070
run: |
7171
go version
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup Go
9595
uses: actions/setup-go@v2
9696
with:
97-
go-version: 1.19
97+
go-version: '1.20'
9898
- name: Install dependencies
9999
run: |
100100
go version
@@ -123,7 +123,7 @@ jobs:
123123
- name: Setup Go
124124
uses: actions/setup-go@v2
125125
with:
126-
go-version: 1.19
126+
go-version: '1.20'
127127
- name: Install dependencies
128128
run: |
129129
go version
@@ -152,7 +152,7 @@ jobs:
152152
- name: Setup Go
153153
uses: actions/setup-go@v2
154154
with:
155-
go-version: 1.19
155+
go-version: '1.20'
156156
- name: Install dependencies
157157
run: |
158158
go version
@@ -181,7 +181,7 @@ jobs:
181181
- name: Setup Go
182182
uses: actions/setup-go@v2
183183
with:
184-
go-version: 1.19
184+
go-version: '1.20'
185185
- name: Install dependencies
186186
run: |
187187
go version
@@ -210,7 +210,7 @@ jobs:
210210
- name: Setup Go
211211
uses: actions/setup-go@v2
212212
with:
213-
go-version: 1.19
213+
go-version: '1.20'
214214
- name: Install dependencies
215215
run: |
216216
go version
@@ -239,7 +239,7 @@ jobs:
239239
- name: Setup Go
240240
uses: actions/setup-go@v2
241241
with:
242-
go-version: 1.19
242+
go-version: '1.20'
243243
- name: Install dependencies
244244
run: |
245245
go version
@@ -268,7 +268,7 @@ jobs:
268268
- name: Setup Go
269269
uses: actions/setup-go@v2
270270
with:
271-
go-version: 1.19
271+
go-version: '1.20'
272272
- name: Install dependencies
273273
run: |
274274
go version

‎.github/workflows/e2e-redis.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- "**/*.md"
1919

2020
env:
21-
ISTIO_VERSION: 1.18.2
21+
ISTIO_VERSION: 1.18.1
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go
3737
uses: actions/setup-go@v2
3838
with:
39-
go-version: 1.19
39+
go-version: '1.20'
4040
- name: Install dependencies
4141
run: |
4242
go install golang.org/x/tools/cmd/goimports@latest

‎.golangci.yml

+13-32
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
---
1616
linters-settings:
1717
depguard:
18-
list-type: blacklist
19-
packages:
20-
# logging is allowed only by logutils.Log, logrus
21-
# is allowed to use only in logutils package
22-
- github.com/sirupsen/logrus
23-
packages-with-error-message:
24-
- github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
18+
rules:
19+
Main:
20+
deny:
21+
- pkg: github.com/gogo/protobuf
22+
desc: "gogo/protobuf is deprecated, use golang/protobuf"
23+
- pkg: gopkg.in/yaml.v2
24+
desc: "use sigs.k8s.io/yaml instead"
25+
- pkg: gopkg.in/yaml.v3
26+
desc: "use sigs.k8s.io/yaml instead"
2527
dupl:
2628
threshold: 100
2729
funlen:
@@ -80,39 +82,18 @@ linters-settings:
8082
linters:
8183
disable-all: true
8284
enable:
85+
- stylecheck
8386
- bodyclose
84-
- deadcode
85-
- depguard
86-
- dogsled
87-
- dupl
88-
- errcheck
8987
- exportloopref
90-
- funlen
91-
- gochecknoinits
92-
- goconst
93-
- gocritic
94-
- gocyclo
9588
- gofmt
9689
- goimports
97-
- goprintffuncname
90+
- goheader
91+
- gocritic
9892
- gosec
99-
- gosimple
100-
- govet
101-
- ineffassign
102-
- lll
10393
- misspell
104-
- nakedret
105-
- noctx
106-
- nolintlint
107-
- staticcheck
108-
- structcheck
109-
- stylecheck
110-
- typecheck
94+
- revive
11195
- unconvert
11296
- unparam
113-
- unused
114-
- varcheck
115-
- whitespace
11697

11798
# don't enable:
11899
# - asciicheck

‎Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ demo-brpc:
5555
uninstall-demo-brpc:
5656
bash demo/uninstall-demo.sh brpc
5757
test: style-check
58-
$(GOMOD) tidy
5958
$(GOTEST) -race `go list ./internal/... | grep -v e2e`
6059
build: test
6160
CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)

‎cmd/aeraki/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ func main() {
8383
server, err := bootstrap.NewServer(args)
8484
if err != nil {
8585
log.Fatalf("Failed to init Aeraki :%v", err)
86-
os.Exit(1)
8786
}
8887
server.Start(stopChan)
8988

‎demo/install-demo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DEMO=$1
2121
SCRIPTS_DIR=$BASEDIR/test/e2e/scripts
2222

2323
if [ -z "$AERAKI_TAG" ]; then
24-
export AERAKI_TAG="1.4.0"
24+
export AERAKI_TAG="1.4.1"
2525
fi
2626
bash ${SCRIPTS_DIR}/istio.sh
2727
bash ${SCRIPTS_DIR}/addons.sh

‎demo/metaprotocol-brpc/brpc-sample.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
metadata:
2929
annotations:
3030
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
31-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
31+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
3232
labels:
3333
app: brpc-echo-server
3434
version: v1
@@ -57,7 +57,7 @@ spec:
5757
metadata:
5858
annotations:
5959
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
60-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
60+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
6161
labels:
6262
app: brpc-echo-server
6363
version: v2
@@ -86,7 +86,7 @@ spec:
8686
metadata:
8787
annotations:
8888
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
89-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
89+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
9090
labels:
9191
app: brpc-echo-client
9292
spec:

‎demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
metadata:
4141
annotations:
4242
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
43-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
43+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
4444
labels:
4545
app: dubbo-sample-provider
4646
version: v1
@@ -76,7 +76,7 @@ spec:
7676
metadata:
7777
annotations:
7878
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
79-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
79+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
8080
labels:
8181
app: dubbo-sample-provider
8282
version: v2
@@ -112,7 +112,7 @@ spec:
112112
metadata:
113113
annotations:
114114
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
115-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
115+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
116116
labels:
117117
app: dubbo-sample-second-provider
118118
version: v2
@@ -139,7 +139,7 @@ spec:
139139
metadata:
140140
annotations:
141141
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
142-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
142+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
143143
labels:
144144
app: dubbo-sample-consumer
145145
spec:

‎demo/metaprotocol-dubbo/dubbo-sample.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
metadata:
4141
annotations:
4242
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
43-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
43+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
4444
labels:
4545
app: dubbo-sample-provider
4646
version: v1
@@ -76,7 +76,7 @@ spec:
7676
metadata:
7777
annotations:
7878
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
79-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
79+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
8080
labels:
8181
app: dubbo-sample-provider
8282
version: v2
@@ -112,7 +112,7 @@ spec:
112112
metadata:
113113
annotations:
114114
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
115-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
115+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
116116
labels:
117117
app: dubbo-sample-second-provider
118118
version: v2
@@ -139,7 +139,7 @@ spec:
139139
metadata:
140140
annotations:
141141
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
142-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
142+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
143143
labels:
144144
app: dubbo-sample-consumer
145145
spec:

‎demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
metadata:
3030
annotations:
3131
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
32-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
32+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
3333
sidecar.istio.io/rewriteAppHTTPProbers: "false"
3434
labels:
3535
app: thrift-sample-server

‎demo/metaprotocol-thrift/thrift-sample.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
metadata:
2929
annotations:
3030
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
31-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
31+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
3232
sidecar.istio.io/rewriteAppHTTPProbers: "false"
3333
labels:
3434
app: thrift-sample-server
@@ -55,7 +55,7 @@ spec:
5555
metadata:
5656
annotations:
5757
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
58-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
58+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
5959
sidecar.istio.io/rewriteAppHTTPProbers: "false"
6060
labels:
6161
app: thrift-sample-server
@@ -82,7 +82,7 @@ spec:
8282
metadata:
8383
annotations:
8484
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
85-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
85+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
8686
sidecar.istio.io/rewriteAppHTTPProbers: "false"
8787
labels:
8888
app: thrift-sample-client

0 commit comments

Comments
 (0)