Skip to content

Commit a3a2b14

Browse files
zhaohuabingzhaohuabing
authored
Upgrade Istio to 1.18.2 (#369)
* upgrade to 1.18.2 Signed-off-by: huabing zhao <[email protected]> * upgrade istio to 1.18.2 Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]>
1 parent df76fb3 commit a3a2b14

File tree

13 files changed

+25
-26
lines changed

13 files changed

+25
-26
lines changed

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

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

2020
env:
21-
ISTIO_VERSION: 1.16.5
21+
ISTIO_VERSION: 1.18.2
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common

‎.github/workflows/e2e-metaprotocol.yaml

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

2020
env:
21-
ISTIO_VERSION: 1.16.5
21+
ISTIO_VERSION: 1.18.2
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common

‎.github/workflows/e2e-redis.yaml

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

2020
env:
21-
ISTIO_VERSION: 1.16.5
21+
ISTIO_VERSION: 1.18.2
2222
ISTIO_NAMESPACE: istio-system
2323
SCRIPTS_DIR: test/e2e/scripts
2424
COMMON_DIR: test/e2e/common

‎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.3.1
31+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
60+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
89+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
43+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
79+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
115+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
142+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
43+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
79+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
115+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
142+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
32+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
31+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
58+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
85+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
8686
sidecar.istio.io/rewriteAppHTTPProbers: "false"
8787
labels:
8888
app: thrift-sample-client

‎docs/zh/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ istiod-bcddf5d98-mq9ln 1/1 Running 0 43m
7373
[使用 aeraki 来对dubbo协议进行测试](https://github.com/aeraki-mesh/dubbo2istio)
7474

7575
Dubbo2istio 将 Dubbo 服务注册表中的 Dubbo 服务自动同步到 Istio 服务网格中，目前已经支持 ZooKeeper，Nacos 和 Etcd。
76-

‎test/e2e/metaprotocol/testdata/metaprotocol-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.3.1
43+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
79+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
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.3.1
115+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
116116
labels:
117117
app: dubbo-sample-second-provider
118118
version: v2
@@ -148,7 +148,7 @@ spec:
148148
metadata:
149149
annotations:
150150
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
151-
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1
151+
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
152152
labels:
153153
app: dubbo-sample-consumer
154154
spec:

‎test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ spec:
149149
fieldPath: metadata.labels['service.istio.io/canonical-revision']
150150
- name: ISTIO_META_ROUTER_MODE
151151
value: standard
152-
image: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1
152+
image: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
153153
imagePullPolicy: IfNotPresent
154154
name: istio-proxy
155155
ports:

‎test/e2e/scripts/istio.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ -z "$ISTIO_NAMESPACE" ]; then
2525
fi
2626

2727
if [ -z "$ISTIO_VERSION" ]; then
28-
export ISTIO_VERSION=1.16.5
28+
export ISTIO_VERSION=1.18.2
2929
fi
3030

3131
kubectl create ns ${ISTIO_NAMESPACE} || true

‎test/e2e/scripts/uninstall-istio.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ -z "$ISTIO_NAMESPACE" ]; then
2525
fi
2626

2727
if [ -z "$ISTIO_VERSION" ]; then
28-
export ISTIO_VERSION=1.16.5
28+
export ISTIO_VERSION=1.18.2
2929
fi
3030

3131
rm -rf ~/.aeraki/istio/istio-config.yaml

0 commit comments

Comments
 (0)