diff --git a/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh b/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh index 2459025cb8..2de58b9fdb 100644 --- a/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh +++ b/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh @@ -25,5 +25,5 @@ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimenta } bpsnip_gateway_api_gamma_experimental_enable_alpha_crds() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set values.pilot.env.PILOT_ENABLE_ALPHA_GATEWAY_API=true --set profile=minimal -y +istioctl install --set values.pilot.env.PILOT_ENABLE_ALPHA_GATEWAY_API=true --set profile=minimal -y } diff --git a/content/en/docs/ambient/getting-started/snips.sh b/content/en/docs/ambient/getting-started/snips.sh index b8643cc373..b28a1dbde1 100644 --- a/content/en/docs/ambient/getting-started/snips.sh +++ b/content/en/docs/ambient/getting-started/snips.sh @@ -22,5 +22,5 @@ source "content/en/boilerplates/snips/gateway-api-install-crds.sh" snip_install_ambient() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=ambient --skip-confirmation +istioctl install --set profile=ambient --skip-confirmation } diff --git a/content/en/docs/ambient/install/istioctl/snips.sh b/content/en/docs/ambient/install/istioctl/snips.sh index fede58baa5..11824392fb 100644 --- a/content/en/docs/ambient/install/istioctl/snips.sh +++ b/content/en/docs/ambient/install/istioctl/snips.sh @@ -22,7 +22,7 @@ source "content/en/boilerplates/snips/gateway-api-install-crds.sh" snip_install_ambient() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=ambient --skip-confirmation +istioctl install --set profile=ambient --skip-confirmation } snip_uninstall() { diff --git a/content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh b/content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh index 0edd077e91..24513b1460 100644 --- a/content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh +++ b/content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh @@ -21,7 +21,7 @@ #################################################################################################### snip_getting_started_1() { -cat < --set meshConfig.accessLogFile=/dev/stdout +$ istioctl install --set meshConfig.accessLogFile=/dev/stdout ENDSNIP snip_perform_tls_origination_with_an_egress_gateway_1() { diff --git a/content/en/docs/tasks/traffic-management/egress/egress-gateway/snips.sh b/content/en/docs/tasks/traffic-management/egress/egress-gateway/snips.sh index d355c6321e..9d459bdff4 100644 --- a/content/en/docs/tasks/traffic-management/egress/egress-gateway/snips.sh +++ b/content/en/docs/tasks/traffic-management/egress/egress-gateway/snips.sh @@ -30,7 +30,7 @@ export SOURCE_POD=$(kubectl get pod -l app=sleep -o jsonpath={.items..metadata.n } ! IFS=$'\n' read -r -d '' snip_before_you_begin_3 <<\ENDSNIP -$ istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set meshConfig.accessLogFile=/dev/stdout +$ istioctl install --set meshConfig.accessLogFile=/dev/stdout ENDSNIP snip_deploy_istio_egress_gateway_1() { diff --git a/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/snips.sh b/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/snips.sh index ef8b4aae71..d4e90fc019 100644 --- a/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/snips.sh +++ b/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/snips.sh @@ -22,11 +22,11 @@ source "content/en/boilerplates/snips/gateway-api-support.sh" snip_before_you_begin_1() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=demo --set meshConfig.outboundTrafficPolicy.mode=REGISTRY_ONLY +istioctl install --set profile=demo --set meshConfig.outboundTrafficPolicy.mode=REGISTRY_ONLY } snip_before_you_begin_2() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=minimal -y \ +istioctl install --set profile=minimal -y \ --set values.pilot.env.PILOT_ENABLE_ALPHA_GATEWAY_API=true \ --set meshConfig.accessLogFile=/dev/stdout \ --set meshConfig.outboundTrafficPolicy.mode=REGISTRY_ONLY diff --git a/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh index 2dd8970658..34f5b8c284 100644 --- a/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh +++ b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh @@ -26,7 +26,7 @@ kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \ } snip_setup_2() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=minimal -y +istioctl install --set profile=minimal -y } snip_configuring_a_gateway_1() { diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-control/snips.sh b/content/en/docs/tasks/traffic-management/ingress/ingress-control/snips.sh index c78d930c16..9ee8d37f0a 100644 --- a/content/en/docs/tasks/traffic-management/ingress/ingress-control/snips.sh +++ b/content/en/docs/tasks/traffic-management/ingress/ingress-control/snips.sh @@ -22,7 +22,7 @@ source "content/en/boilerplates/snips/gateway-api-support.sh" snip_before_you_begin_1() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=minimal +istioctl install --set profile=minimal } snip_before_you_begin_2() { diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-sidecar-tls-termination/snips.sh b/content/en/docs/tasks/traffic-management/ingress/ingress-sidecar-tls-termination/snips.sh index fe27bc3b75..f60428f826 100644 --- a/content/en/docs/tasks/traffic-management/ingress/ingress-sidecar-tls-termination/snips.sh +++ b/content/en/docs/tasks/traffic-management/ingress/ingress-sidecar-tls-termination/snips.sh @@ -21,7 +21,7 @@ #################################################################################################### snip_before_you_begin_1() { -istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=default --set values.pilot.env.ENABLE_TLS_ON_SIDECAR_INGRESS=true +istioctl install --set profile=default --set values.pilot.env.ENABLE_TLS_ON_SIDECAR_INGRESS=true } snip_before_you_begin_2() { diff --git a/scripts/snip.py b/scripts/snip.py index 651ff85736..651fee8d6b 100644 --- a/scripts/snip.py +++ b/scripts/snip.py @@ -104,7 +104,6 @@ with open(markdown, 'rt', encoding='utf-8') as mdfile: # Replace github file token with release-specific URL. github_url = "https://raw.githubusercontent.com/istio/istio/" + source_branch_name line = line.replace("{{< github_file >}}", github_url) - line = line.replace("istioctl install", "istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true") line = line.replace("kubectl delete gtw", "kubectl delete gtw --cascade=foreground") match = sectionhead.match(line) diff --git a/tests/setup/dualstack/doc_test.go b/tests/setup/dualstack/doc_test.go index e17d1234c8..d44c95a214 100755 --- a/tests/setup/dualstack/doc_test.go +++ b/tests/setup/dualstack/doc_test.go @@ -45,7 +45,6 @@ meshConfig: values: pilot: env: - PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING: true PILOT_ENABLE_ALPHA_GATEWAY_API: false ISTIO_DUAL_STACK: true gateways: diff --git a/tests/setup/profile-ambient/doc_test.go b/tests/setup/profile-ambient/doc_test.go index 949608ec18..c55ea0ac60 100644 --- a/tests/setup/profile-ambient/doc_test.go +++ b/tests/setup/profile-ambient/doc_test.go @@ -42,7 +42,6 @@ profile: ambient values: pilot: env: - PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING: true PILOT_ENABLE_ALPHA_GATEWAY_API: false components: egressGateways: diff --git a/tests/setup/profile-default/doc_test.go b/tests/setup/profile-default/doc_test.go index adf96f1cef..8d74734b03 100644 --- a/tests/setup/profile-default/doc_test.go +++ b/tests/setup/profile-default/doc_test.go @@ -41,7 +41,6 @@ func setupConfig(ctx resource.Context, cfg *istio.Config) { values: pilot: env: - PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING: true PILOT_ENABLE_ALPHA_GATEWAY_API: false ` } diff --git a/tests/setup/profile-demo/doc_test.go b/tests/setup/profile-demo/doc_test.go index 40d31371ff..ec0f8a24ca 100644 --- a/tests/setup/profile-demo/doc_test.go +++ b/tests/setup/profile-demo/doc_test.go @@ -42,7 +42,6 @@ profile: demo values: pilot: env: - PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING: true PILOT_ENABLE_ALPHA_GATEWAY_API: false ` } diff --git a/tests/setup/profile-minimal/doc_test.go b/tests/setup/profile-minimal/doc_test.go index 048ded4553..29631650dd 100644 --- a/tests/setup/profile-minimal/doc_test.go +++ b/tests/setup/profile-minimal/doc_test.go @@ -43,7 +43,6 @@ func setupConfig(ctx resource.Context, cfg *istio.Config) { values: pilot: env: - PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING: true PILOT_ENABLE_ALPHA_GATEWAY_API: false components: egressGateways: