From 0330c7ce2569e7b04cbb1cefc69585a2af9dec6e Mon Sep 17 00:00:00 2001 From: Xunzhuo Date: Mon, 23 May 2022 10:30:16 +0800 Subject: [PATCH] update metaprotocol proxy to 1.1.0 (#227) https://github.com/aeraki-mesh/aeraki/issues/222 Signed-off-by: Xunzhuo --- demo/metaprotocol-brpc/brpc-protocol.yaml | 23 +++++++++++++++++++ demo/metaprotocol-brpc/brpc-sample.yaml | 6 ++--- demo/metaprotocol-dubbo/dubbo-sample.yaml | 6 ++--- .../outlier-detection/outlier-detection.yaml | 2 +- demo/metaprotocol-thrift/thrift-sample.yaml | 6 ++--- .../testdata/metaprotocol-sample.yaml | 6 ++--- 6 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 demo/metaprotocol-brpc/brpc-protocol.yaml diff --git a/demo/metaprotocol-brpc/brpc-protocol.yaml b/demo/metaprotocol-brpc/brpc-protocol.yaml new file mode 100644 index 000000000..8a5fe2e17 --- /dev/null +++ b/demo/metaprotocol-brpc/brpc-protocol.yaml @@ -0,0 +1,23 @@ +# Copyright Aeraki Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +apiVersion: metaprotocol.aeraki.io/v1alpha1 +kind: ApplicationProtocol +metadata: + name: brpc + namespace: istio-system +spec: + codec: aeraki.meta_protocol.codec.brpc + protocol: brpc diff --git a/demo/metaprotocol-brpc/brpc-sample.yaml b/demo/metaprotocol-brpc/brpc-sample.yaml index e17748d91..0c6c86b6b 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: smwyzi/proxyv2:brpc-0.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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: smwyzi/proxyv2:brpc-0.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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: smwyzi/proxyv2:brpc-0.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: brpc-echo-client spec: diff --git a/demo/metaprotocol-dubbo/dubbo-sample.yaml b/demo/metaprotocol-dubbo/dubbo-sample.yaml index 2eb5a4ea4..745aa7603 100644 --- a/demo/metaprotocol-dubbo/dubbo-sample.yaml +++ b/demo/metaprotocol-dubbo/dubbo-sample.yaml @@ -28,7 +28,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: dubbo-sample-provider version: v1 @@ -55,7 +55,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: dubbo-sample-provider version: v2 @@ -82,7 +82,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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 index e9b23b406..11c0523ff 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: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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 index 10f5e27c9..196de3a89 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: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.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: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 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 4a268c24f..16fc1a1f7 100644 --- a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml +++ b/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml @@ -14,7 +14,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: dubbo-sample-provider version: v1 @@ -41,7 +41,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: dubbo-sample-provider version: v2 @@ -68,7 +68,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.1.0 labels: app: dubbo-sample-consumer spec: