Skip to content

upgrade aeraki to support istio 1.16.5 #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2023
Merged

upgrade aeraki to support istio 1.16.5 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b6418
Signed-off-by: chentanjun <[email protected]>
tanjunchen Jun 20, 2023
f5df5b3
Update install-demo.sh
zhaohuabing Jun 21, 2023
4b71c0e
Update ingress-gateway.yaml
zhaohuabing Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-dubbo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-metaprotocol-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-metaprotocol.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-thrift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions demo/metaprotocol-brpc/brpc-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions demo/metaprotocol-dubbo/dubbo-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions demo/metaprotocol-thrift/thrift-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/metaprotocolgateway/testdata/ingress-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/meta-protocol-proxy-debug:1.3.1
imagePullPolicy: IfNotPresent
name: istio-proxy
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scripts/istio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scripts/uninstall-istio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down