From 4e5246b78f59115888fe34acf57efd4bcdae614d Mon Sep 17 00:00:00 2001 From: Xinnan Wen Date: Tue, 25 Feb 2020 09:08:34 -0800 Subject: [PATCH] update outdated injection related doc (#6538) --- .../install/multicluster/shared-gateways/index.md | 4 +--- .../setup/install/multicluster/shared-vpn/index.md | 12 ++++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/content/en/docs/setup/install/multicluster/shared-gateways/index.md b/content/en/docs/setup/install/multicluster/shared-gateways/index.md index b37133bcc5..e0e1b21a4d 100644 --- a/content/en/docs/setup/install/multicluster/shared-gateways/index.md +++ b/content/en/docs/setup/install/multicluster/shared-gateways/index.md @@ -191,7 +191,6 @@ This will be used to access pilot on `cluster1` securely using the ingress gatew --set values.gateways.istio-ingressgateway.env.ISTIO_META_NETWORK="network2" \ --set values.global.network="network2" \ --set values.global.multiCluster.clusterName=${CLUSTER_NAME} \ - --set autoInjection.enabled=true {{< /text >}} Wait for the Istio pods on `cluster2`, except for `istio-ingressgateway`, to become ready: @@ -438,8 +437,7 @@ $ istioctl manifest generate --context=$CTX_CLUSTER2 \ --set values.global.remotePolicyAddress=${LOCAL_GW_ADDR} \ --set values.global.remoteTelemetryAddress=${LOCAL_GW_ADDR} \ --set values.gateways.istio-ingressgateway.env.ISTIO_META_NETWORK="network2" \ - --set values.global.network="network2" \ - --set autoInjection.enabled=true | kubectl --context=$CTX_CLUSTER2 delete -f - + --set values.global.network="network2" | kubectl --context=$CTX_CLUSTER2 delete -f - $ kubectl delete --context=$CTX_CLUSTER2 ns sample $ rm n2-k8s-config $ unset CTX_CLUSTER2 CLUSTER_NAME SERVER SECRET_NAME CA_DATA TOKEN INGRESS_HOST SECURE_INGRESS_PORT INGRESS_PORT LOCAL_GW_ADDR diff --git a/content/en/docs/setup/install/multicluster/shared-vpn/index.md b/content/en/docs/setup/install/multicluster/shared-vpn/index.md index 2ee75d5222..88eec8cc09 100644 --- a/content/en/docs/setup/install/multicluster/shared-vpn/index.md +++ b/content/en/docs/setup/install/multicluster/shared-vpn/index.md @@ -84,8 +84,7 @@ cluster. You can install the component in one of two ways: --set values.global.remotePilotAddress=${PILOT_POD_IP} \ --set values.global.remotePolicyAddress=${POLICY_POD_IP} \ --set values.global.remoteTelemetryAddress=${TELEMETRY_POD_IP} \ - --set gateways.enabled=false \ - --set autoInjection.enabled=true + --set gateways.enabled=false {{< /text >}} {{< tip >}} @@ -244,8 +243,7 @@ To uninstall the cluster run the following command: --set values.global.remotePilotAddress=${PILOT_POD_IP} \ --set values.global.remotePolicyAddress=${POLICY_POD_IP} \ --set values.global.remoteTelemetryAddress=${TELEMETRY_POD_IP} \ - --set gateways.enabled=false \ - --set autoInjection.enabled=true | kubectl delete -f - + --set gateways.enabled=false | kubectl delete -f - {{< /text >}} ## Manual sidecar injection example {#manual-sidecar} @@ -272,8 +270,7 @@ Before you begin, set the endpoint IP environment variables as described in the --set values.global.remotePilotAddress=${PILOT_POD_IP} \ --set values.global.remotePolicyAddress=${POLICY_POD_IP} \ --set values.global.remoteTelemetryAddress=${TELEMETRY_POD_IP} \ - --set gateways.enabled=false \ - --set autoInjection.enabled=false + --set gateways.enabled=false {{< /text >}} 1. [Generate](#kubeconfig) the `kubeconfig` configuration file for each remote @@ -490,8 +487,7 @@ and endpoint to allow the remote sidecars to resolve the --set values.global.remotePilotAddress=${PILOT_POD_IP} \ --set values.global.remotePolicyAddress=${POLICY_POD_IP} \ --set values.global.remoteTelemetryAddress=${TELEMETRY_POD_IP} \ - --set gateways.enabled=false \ - --set autoInjection.enabled=true + --set gateways.enabled=false {{< /text >}} 1. To generate the `kubeconfig` configuration file for the remote cluster,