From 23b6418e33273bd1e245f6f1715f43e476a77628 Mon Sep 17 00:00:00 2001 From: chentanjun Date: Tue, 20 Jun 2023 17:19:08 +0800 Subject: [PATCH 1/3] Signed-off-by: chentanjun upgrade aeraki to support istio 1.16.5 --- .github/workflows/e2e-dubbo.yaml | 2 +- .github/workflows/e2e-metaprotocol-gateway.yaml | 2 +- .github/workflows/e2e-metaprotocol.yaml | 2 +- .github/workflows/e2e-redis.yaml | 2 +- .github/workflows/e2e-thrift.yaml | 2 +- demo/install-demo.sh | 2 +- demo/metaprotocol-brpc/brpc-sample.yaml | 6 +++--- demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml | 8 ++++---- demo/metaprotocol-dubbo/dubbo-sample.yaml | 8 ++++---- .../outlier-detection/outlier-detection.yaml | 2 +- demo/metaprotocol-thrift/thrift-sample.yaml | 6 +++--- test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml | 8 ++++---- .../e2e/metaprotocolgateway/testdata/ingress-gateway.yaml | 2 +- test/e2e/scripts/istio.sh | 2 +- test/e2e/scripts/uninstall-istio.sh | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/e2e-dubbo.yaml b/.github/workflows/e2e-dubbo.yaml index b67244d96..a6be4b47d 100644 --- a/.github/workflows/e2e-dubbo.yaml +++ b/.github/workflows/e2e-dubbo.yaml @@ -4,7 +4,7 @@ name: e2e-dubbo on: [push, pull_request] env: - ISTIO_VERSION: 1.14.5 + ISTIO_VERSION: 1.16.5 ISTIO_NAMESPACE: istio-system SCRIPTS_DIR: test/e2e/scripts COMMON_DIR: test/e2e/common diff --git a/.github/workflows/e2e-metaprotocol-gateway.yaml b/.github/workflows/e2e-metaprotocol-gateway.yaml index af957f7f5..2c80b275a 100644 --- a/.github/workflows/e2e-metaprotocol-gateway.yaml +++ b/.github/workflows/e2e-metaprotocol-gateway.yaml @@ -4,7 +4,7 @@ name: e2e-metaprotocolgateway on: [push, pull_request] env: - ISTIO_VERSION: 1.14.5 + ISTIO_VERSION: 1.16.5 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 index 759bc627d..815634491 100644 --- a/.github/workflows/e2e-metaprotocol.yaml +++ b/.github/workflows/e2e-metaprotocol.yaml @@ -4,7 +4,7 @@ name: e2e-metaprotocol on: [push, pull_request] env: - ISTIO_VERSION: 1.14.5 + ISTIO_VERSION: 1.16.5 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 index a5341661f..74f01af8c 100644 --- a/.github/workflows/e2e-redis.yaml +++ b/.github/workflows/e2e-redis.yaml @@ -4,7 +4,7 @@ name: e2e-redis on: [push, pull_request] env: - ISTIO_VERSION: 1.14.5 + ISTIO_VERSION: 1.16.5 ISTIO_NAMESPACE: istio-system SCRIPTS_DIR: test/e2e/scripts COMMON_DIR: test/e2e/common diff --git a/.github/workflows/e2e-thrift.yaml b/.github/workflows/e2e-thrift.yaml index 1925aa571..8367c86d0 100644 --- a/.github/workflows/e2e-thrift.yaml +++ b/.github/workflows/e2e-thrift.yaml @@ -4,7 +4,7 @@ name: e2e-thrift on: [push, pull_request] env: - ISTIO_VERSION: 1.14.5 + ISTIO_VERSION: 1.16.5 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 index c54c38b26..477772e9f 100755 --- 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.2.3" + export AERAKI_TAG="1.3.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 index c38893b8f..14444202b 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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 index fb70fda89..f2b518c0d 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1 labels: app: dubbo-sample-consumer spec: diff --git a/demo/metaprotocol-dubbo/dubbo-sample.yaml b/demo/metaprotocol-dubbo/dubbo-sample.yaml index eeff96d6f..f647e2c08 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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 index 640bf07ac..aa1224e92 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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 index f764c6766..dfcd3d1b5 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-client diff --git a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml b/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml index 5eaeff191..3ab7d0f1f 100644 --- 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1 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.2.3 + sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1 labels: app: dubbo-sample-consumer spec: diff --git a/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml b/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml index 3095dc132..b5adb05f3 100644 --- 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: aeraki/meta-protocol-proxy-debug:1.2.3 + image: ghcr.io/aeraki-mesh/aeraki/meta-protocol-proxy-debug:1.3.1 imagePullPolicy: IfNotPresent name: istio-proxy ports: diff --git a/test/e2e/scripts/istio.sh b/test/e2e/scripts/istio.sh index 377dea6f9..b24aeb89c 100644 --- 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.14.5 + export ISTIO_VERSION=1.16.5 fi kubectl create ns ${ISTIO_NAMESPACE} || true diff --git a/test/e2e/scripts/uninstall-istio.sh b/test/e2e/scripts/uninstall-istio.sh index a5eda470a..5674ca059 100644 --- 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.14.5 + export ISTIO_VERSION=1.16.5 fi rm -rf ~/.aeraki/istio/istio-config.yaml From f5df5b319346e3f99e8498caf4eb28a15147e654 Mon Sep 17 00:00:00 2001 From: zhaohuabing Date: Wed, 21 Jun 2023 18:48:26 +0800 Subject: [PATCH 2/3] Update install-demo.sh --- demo/install-demo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/install-demo.sh b/demo/install-demo.sh index 477772e9f..c54c38b26 100755 --- 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.2.3" fi bash ${SCRIPTS_DIR}/istio.sh bash ${SCRIPTS_DIR}/addons.sh From 4b71c0ef85a460d3ee1f49f7474ea15e302c6573 Mon Sep 17 00:00:00 2001 From: zhaohuabing Date: Sat, 24 Jun 2023 13:31:39 +0800 Subject: [PATCH 3/3] Update ingress-gateway.yaml --- test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml b/test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml index b5adb05f3..3074f8d70 100644 --- 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/aeraki/meta-protocol-proxy-debug:1.3.1 + image: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.3.1 imagePullPolicy: IfNotPresent name: istio-proxy ports: