Upgrade Istio to 1.18.2 (#369)

* upgrade to 1.18.2 Signed-off-by: huabing zhao <zhaohuabing@gmail.com> * upgrade istio to 1.18.2 Signed-off-by: huabing zhao <zhaohuabing@gmail.com> --------- Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
aeraki-mesh · Aug 12, 2023 · b7439f7 · b7439f7
1 parent df76fb3
commit b7439f7
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 27 deletions.
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.16.5
+  ISTIO_VERSION: 1.18.2
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common

diff --git a/.github/workflows/e2e-metaprotocol.yaml b/.github/workflows/e2e-metaprotocol.yaml
@@ -18,7 +18,7 @@ on:
     - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.16.5
+  ISTIO_VERSION: 1.18.2
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common

diff --git a/.github/workflows/e2e-redis.yaml b/.github/workflows/e2e-redis.yaml
@@ -18,7 +18,7 @@ on:
     - "**/*.md"
 
 env:
-  ISTIO_VERSION: 1.16.5
+  ISTIO_VERSION: 1.18.2
   ISTIO_NAMESPACE: istio-system
   SCRIPTS_DIR: test/e2e/scripts
   COMMON_DIR: test/e2e/common

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.3.0"
+  export AERAKI_TAG="1.4.0"
 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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
         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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
         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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
         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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
         sidecar.istio.io/rewriteAppHTTPProbers: "false"
       labels:
         app: thrift-sample-client

diff --git a/docs/zh/README.md b/docs/zh/README.md
@@ -73,4 +73,3 @@ istiod-bcddf5d98-mq9ln                 1/1     Running   0          43m
 [使用 aeraki 来对dubbo协议进行测试](https://github.com/aeraki-mesh/dubbo2istio)
 
 Dubbo2istio 将 Dubbo 服务注册表中的 Dubbo 服务自动同步到 Istio 服务网格中，目前已经支持 ZooKeeper，Nacos 和 Etcd。
-
diff --git a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml b/test/e2e/metaprotocol/testdata/metaprotocol-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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       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.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       labels:
         app: dubbo-sample-second-provider
         version: v2
@@ -148,7 +148,7 @@ spec:
     metadata:
       annotations:
         sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
-        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1
+        sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
       labels:
         app: dubbo-sample-consumer
     spec:

diff --git a/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml b/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml
@@ -149,7 +149,7 @@ spec:
                   fieldPath: metadata.labels['service.istio.io/canonical-revision']
             - name: ISTIO_META_ROUTER_MODE
               value: standard
-          image: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1
+          image: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
           imagePullPolicy: IfNotPresent
           name: istio-proxy
           ports:

diff --git a/test/e2e/scripts/istio.sh b/test/e2e/scripts/istio.sh
@@ -25,7 +25,7 @@ if [ -z "$ISTIO_NAMESPACE" ]; then
 fi
 
 if [ -z "$ISTIO_VERSION" ]; then
-  export ISTIO_VERSION=1.16.5
+  export ISTIO_VERSION=1.18.2
 fi
 
 kubectl create ns ${ISTIO_NAMESPACE} || true

diff --git a/test/e2e/scripts/uninstall-istio.sh b/test/e2e/scripts/uninstall-istio.sh
@@ -25,7 +25,7 @@ if [ -z "$ISTIO_NAMESPACE" ]; then
 fi
 
 if [ -z "$ISTIO_VERSION" ]; then
-  export ISTIO_VERSION=1.16.5
+  export ISTIO_VERSION=1.18.2
 fi
 
 rm -rf ~/.aeraki/istio/istio-config.yaml