diff --git a/demo/metaprotocol-dubbo/dubbo-sample.yaml b/demo/metaprotocol-dubbo/dubbo-sample.yaml index 7cf668362..2eb5a4ea4 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 labels: app: dubbo-sample-consumer spec: diff --git a/demo/metaprotocol-qza/destinationrule.yaml b/demo/metaprotocol-qza/destinationrule.yaml index 56084ea09..590831419 100644 --- a/demo/metaprotocol-qza/destinationrule.yaml +++ b/demo/metaprotocol-qza/destinationrule.yaml @@ -19,7 +19,7 @@ metadata: name: qza-sample-server namespace: meta-qza spec: - host: qza-sample-server + host: qza-sample-server.meta-qza.svc.cluster.local subsets: - name: v1 labels: diff --git a/demo/metaprotocol-thrift/consistent-hash-lb/destinationrule.yaml b/demo/metaprotocol-thrift/consistent-hash-lb/destinationrule.yaml new file mode 100644 index 000000000..13a85038d --- /dev/null +++ b/demo/metaprotocol-thrift/consistent-hash-lb/destinationrule.yaml @@ -0,0 +1,26 @@ +# 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: networking.istio.io/v1alpha3 +kind: DestinationRule +metadata: + name: thrift-sample-server + namespace: meta-thrift +spec: + host: thrift-sample-server.meta-thrift.svc.cluster.local + trafficPolicy: + loadBalancer: + consistentHash: + httpHeaderName: method diff --git a/demo/metaprotocol-thrift/destinationrule.yaml b/demo/metaprotocol-thrift/destinationrule.yaml index 5b34d9dbe..05a9d0bc9 100644 --- a/demo/metaprotocol-thrift/destinationrule.yaml +++ b/demo/metaprotocol-thrift/destinationrule.yaml @@ -19,7 +19,7 @@ metadata: name: thrift-sample-server namespace: meta-thrift spec: - host: thrift-sample-server + host: thrift-sample-server.meta-thrift.svc.cluster.local subsets: - name: v1 labels: diff --git a/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml b/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml index 2177a98c1..e9b23b406 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-server @@ -46,7 +46,7 @@ metadata: name: thrift-sample-server namespace: meta-thrift spec: - host: thrift-sample-server + host: thrift-sample-server.meta-thrift.svc.cluster.local trafficPolicy: outlierDetection: baseEjectionTime: 15m diff --git a/demo/metaprotocol-thrift/thrift-sample.yaml b/demo/metaprotocol-thrift/thrift-sample.yaml index 8acca3e83..10f5e27c9 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-client diff --git a/demo/metaprotocol-trpc/destinationrule.yaml b/demo/metaprotocol-trpc/destinationrule.yaml index 1d4990983..2f6a8c1bb 100644 --- a/demo/metaprotocol-trpc/destinationrule.yaml +++ b/demo/metaprotocol-trpc/destinationrule.yaml @@ -19,7 +19,7 @@ metadata: name: trpc-sample-server namespace: meta-trpc spec: - host: trpc-sample-server + host: trpc-sample-server.meta-trpc.svc.cluster.local subsets: - name: v1 labels: diff --git a/demo/metaprotocol-videopacket/destinationrule.yaml b/demo/metaprotocol-videopacket/destinationrule.yaml index 1093d88dd..33481b0b2 100644 --- a/demo/metaprotocol-videopacket/destinationrule.yaml +++ b/demo/metaprotocol-videopacket/destinationrule.yaml @@ -19,7 +19,7 @@ metadata: name: videopacket-sample-server namespace: meta-videopacket spec: - host: videopacket-sample-server + host: videopacket-sample-server.meta-videopacket.svc.cluster.local subsets: - name: v1 labels: diff --git a/demo/thrift/destinationrule.yaml b/demo/thrift/destinationrule.yaml index 13dd6fea1..e4d4e0a61 100644 --- a/demo/thrift/destinationrule.yaml +++ b/demo/thrift/destinationrule.yaml @@ -18,7 +18,7 @@ kind: DestinationRule metadata: name: thrift-sample-server spec: - host: thrift-sample-server + host: thrift-sample-server.thrift.svc.cluster.local subsets: - name: v1 labels: diff --git a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml b/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml index 027f77b65..4a268c24f 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 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.1 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy:1.0.2 labels: app: dubbo-sample-consumer spec: