Revert "cleanup eastwest gen (#8457)" (#8467)

This reverts commit 13e1d08238.
This commit is contained in:
Steven Landow 2020-11-09 10:39:37 -08:00 committed by GitHub
parent de929b4975
commit 1345a65998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 30 deletions

View File

@ -71,9 +71,10 @@ external attacks. Check with your cloud vendor to see what options are
available.
{{< text bash >}}
$ @samples/multicluster/gen-eastwest-gateway.sh@ \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
$ MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
@samples/multicluster/gen-eastwest-gateway.sh@ | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
{{< /text >}}
Wait for the east-west gateway to be assigned an external IP address:
@ -136,9 +137,10 @@ As we did with `cluster1` above, install a gateway in `cluster2` that is dedicat
to east-west traffic.
{{< text bash >}}
$ @samples/multicluster/gen-eastwest-gateway.sh@ \
--mesh mesh1 --cluster cluster2 --network network2 | \
istioctl --context="${CTX_CLUSTER2}" install -y -f -
$ MESH=mesh1 CLUSTER=cluster2 NETWORK=network2 \
@samples/multicluster/gen-eastwest-gateway.sh@ | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER2}" -f -
{{< /text >}}
Wait for the east-west gateway to be assigned an external IP address:

View File

@ -44,9 +44,10 @@ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
}
snip_install_the_eastwest_gateway_in_cluster1_1() {
samples/multicluster/gen-eastwest-gateway.sh \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
samples/multicluster/gen-eastwest-gateway.sh | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
}
snip_install_the_eastwest_gateway_in_cluster1_2() {
@ -87,9 +88,10 @@ istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
}
snip_install_the_eastwest_gateway_in_cluster2_1() {
samples/multicluster/gen-eastwest-gateway.sh \
--mesh mesh1 --cluster cluster2 --network network2 | \
istioctl --context="${CTX_CLUSTER2}" install -y -f -
MESH=mesh1 CLUSTER=cluster2 NETWORK=network2 \
samples/multicluster/gen-eastwest-gateway.sh | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER2}" -f -
}
snip_install_the_eastwest_gateway_in_cluster2_2() {

View File

@ -75,9 +75,10 @@ external attacks. Check with your cloud vendor to see what options are
available.
{{< text bash >}}
$ @samples/multicluster/gen-eastwest-gateway.sh@ \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
$ MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
@samples/multicluster/gen-eastwest-gateway.sh@ | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
{{< /text >}}
Wait for the east-west gateway to be assigned an external IP address:

View File

@ -39,9 +39,10 @@ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
}
snip_install_the_eastwest_gateway_in_cluster1_1() {
samples/multicluster/gen-eastwest-gateway.sh \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
samples/multicluster/gen-eastwest-gateway.sh | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
}
snip_install_the_eastwest_gateway_in_cluster1_2() {

View File

@ -85,9 +85,10 @@ external attacks. Check with your cloud vendor to see what options are
available.
{{< text bash >}}
$ @samples/multicluster/gen-eastwest-gateway.sh@ \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
$ MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
@samples/multicluster/gen-eastwest-gateway.sh@ | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
{{< /text >}}
Wait for the east-west gateway to be assigned an external IP address:
@ -193,9 +194,10 @@ As we did with `cluster1` above, install a gateway in `cluster2` that is dedicat
to east-west traffic and expose user services.
{{< text bash >}}
$ @samples/multicluster/gen-eastwest-gateway.sh@ \
--mesh mesh1 --cluster cluster2 --network network2 | \
istioctl --context="${CTX_CLUSTER2}" install -y -f -
$ MESH=mesh1 CLUSTER=cluster2 NETWORK=network2 \
@samples/multicluster/gen-eastwest-gateway.sh@ | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER2}" -f -
{{< /text >}}
Wait for the east-west gateway to be assigned an external IP address:

View File

@ -44,9 +44,10 @@ istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
}
snip_install_the_eastwest_gateway_in_cluster1_1() {
samples/multicluster/gen-eastwest-gateway.sh \
--mesh mesh1 --cluster cluster1 --network network1 | \
istioctl --context="${CTX_CLUSTER1}" install -y -f -
MESH=mesh1 CLUSTER=cluster1 NETWORK=network1 \
samples/multicluster/gen-eastwest-gateway.sh | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER1}" -f -
}
snip_install_the_eastwest_gateway_in_cluster1_2() {
@ -108,9 +109,10 @@ istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
}
snip_install_the_eastwest_gateway_in_cluster2_1() {
samples/multicluster/gen-eastwest-gateway.sh \
--mesh mesh1 --cluster cluster2 --network network2 | \
istioctl --context="${CTX_CLUSTER2}" install -y -f -
MESH=mesh1 CLUSTER=cluster2 NETWORK=network2 \
samples/multicluster/gen-eastwest-gateway.sh | \
istioctl manifest generate -f - | \
kubectl apply --context="${CTX_CLUSTER2}" -f -
}
snip_install_the_eastwest_gateway_in_cluster2_2() {