diff --git a/content/en/docs/setup/install/external-controlplane/index.md b/content/en/docs/setup/install/external-controlplane/index.md index 6869789da5..d7278678e1 100644 --- a/content/en/docs/setup/install/external-controlplane/index.md +++ b/content/en/docs/setup/install/external-controlplane/index.md @@ -351,7 +351,7 @@ and installing the sidecar injector webhook configuration on the remote cluster 1. Apply the Istio configuration on the external cluster: {{< text bash >}} - $ istioctl manifest generate -f external-istiod.yaml | kubectl apply --context="${CTX_EXTERNAL_CLUSTER}" -f - + $ istioctl install -f external-istiod.yaml --context="${CTX_EXTERNAL_CLUSTER}" {{< /text >}} 1. Confirm that the external istiod has been successfully deployed: diff --git a/content/en/docs/setup/install/external-controlplane/snips.sh b/content/en/docs/setup/install/external-controlplane/snips.sh index c5a1eefc78..fdd76874c8 100644 --- a/content/en/docs/setup/install/external-controlplane/snips.sh +++ b/content/en/docs/setup/install/external-controlplane/snips.sh @@ -215,7 +215,7 @@ sed -i'.bk' \ } snip_set_up_the_control_plane_in_the_external_cluster_5() { -istioctl manifest generate -f external-istiod.yaml | kubectl apply --context="${CTX_EXTERNAL_CLUSTER}" -f - +istioctl install -f external-istiod.yaml --context="${CTX_EXTERNAL_CLUSTER}" } snip_set_up_the_control_plane_in_the_external_cluster_6() { diff --git a/content/en/docs/setup/install/external-controlplane/test.sh b/content/en/docs/setup/install/external-controlplane/test.sh index 89d2c7bcf2..556aa4349c 100644 --- a/content/en/docs/setup/install/external-controlplane/test.sh +++ b/content/en/docs/setup/install/external-controlplane/test.sh @@ -22,8 +22,11 @@ set -u set -o pipefail kubectl_get_egress_gateway_for_remote_cluster() { - response=$(kubectl get pod -l app=istio-egressgateway -n external-istiod --context="${CTX_REMOTE_CLUSTER}" -o jsonpath="{.items[*].status.phase}") - echo "$response" + kubectl get pod -l app=istio-egressgateway -n external-istiod --context="${CTX_REMOTE_CLUSTER}" -o jsonpath="{.items[*].status.phase}" +} + +kubectl_get_external_cluster_webhooks() { + kubectl get mutatingwebhookconfiguration --context="${CTX_EXTERNAL_CLUSTER}" } # Set the CTX_EXTERNAL_CLUSTER, CTX_REMOTE_CLUSTER, and REMOTE_CLUSTER_NAME env variables. @@ -65,6 +68,8 @@ snip_set_up_the_control_plane_in_the_external_cluster_4 echo y | snip_set_up_the_control_plane_in_the_external_cluster_5 +_verify_not_contains kubectl_get_external_cluster_webhooks "external-istiod" # external istiod install should not affect local webhooks + _verify_like snip_set_up_the_control_plane_in_the_external_cluster_6 "$snip_set_up_the_control_plane_in_the_external_cluster_6_out" snip_get_external_istiod_gateway_config