Fix incorrect webhook names in external control plane instructions (#11625)

* Fix incorrect webhook names in external control plane instructions

* fix test
This commit is contained in:
Frank Budinsky 2022-07-21 15:43:43 -04:00 committed by GitHub
parent 43aa5d447e
commit af58cd6436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View File

@ -325,7 +325,7 @@ and installing the sidecar injector webhook configuration on the remote cluster
{{< /text >}}
1. If you are using an IP address for the `EXTERNAL_ISTIOD_ADDR`, instead of a proper DNS hostname,
delete the proxy metadata and webhook config environment variables from the configuration:
delete the proxy metadata and update the webhook config environment variables in the configuration:
{{< warning >}}
This is not recommended in a production environment.
@ -334,8 +334,8 @@ and installing the sidecar injector webhook configuration on the remote cluster
{{< text bash >}}
$ sed -i'.bk' \
-e '/proxyMetadata:/,+2d' \
-e '/INJECTION_WEBHOOK_CONFIG_NAME/,+1d' \
-e '/VALIDATION_WEBHOOK_CONFIG_NAME/,+1d' \
-e '/INJECTION_WEBHOOK_CONFIG_NAME/{n;s/value: ""/value: istio-sidecar-injector-external-istiod/;}' \
-e '/VALIDATION_WEBHOOK_CONFIG_NAME/{n;s/value: ""/value: istio-validator-external-istiod/;}' \
external-istiod.yaml ; rm external-istiod.yaml.bk
{{< /text >}}

View File

@ -199,8 +199,8 @@ EOF
snip_set_up_the_control_plane_in_the_external_cluster_4() {
sed -i'.bk' \
-e '/proxyMetadata:/,+2d' \
-e '/INJECTION_WEBHOOK_CONFIG_NAME/,+1d' \
-e '/VALIDATION_WEBHOOK_CONFIG_NAME/,+1d' \
-e '/INJECTION_WEBHOOK_CONFIG_NAME/{n;s/value: ""/value: istio-sidecar-injector-external-istiod/;}' \
-e '/VALIDATION_WEBHOOK_CONFIG_NAME/{n;s/value: ""/value: istio-validator-external-istiod/;}' \
external-istiod.yaml ; rm external-istiod.yaml.bk
}

View File

@ -51,7 +51,7 @@ snip_set_up_the_remote_config_cluster_2
echo y | snip_set_up_the_remote_config_cluster_3
#set -e
_verify_like snip_set_up_the_remote_config_cluster_4 "$snip_set_up_the_remote_config_cluster_4_out"
_verify_contains snip_set_up_the_remote_config_cluster_4 "istio-sidecar-injector-external-istiod"
# Install istiod on the external cluster.
@ -110,7 +110,7 @@ snip_register_the_new_cluster_3
echo y | snip_register_the_new_cluster_4
# Confirm remote clusters webhook configuration has been installed
_verify_like snip_register_the_new_cluster_5 "$snip_register_the_new_cluster_5_out"
_verify_contains snip_register_the_new_cluster_5 "istio-sidecar-injector-external-istiod"
# Create a secret with credentials to allow the control plane to access the endpoints on the second remote cluster and install it
snip_register_the_new_cluster_6