Remove obsolete PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING from tests (#15676)

This does nothing anymore
2024-09-10 08:21:35 -07:00 · 2024-09-10 08:21:35 -07:00 · c05f7637b1
parent fbaf2f3bf5
commit c05f7637b1
43 changed files with 55 additions and 61 deletions
--- 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
 }
--- 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
 }
--- 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() {
--- 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 <<EOF | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+cat <<EOF | istioctl install -y -f -
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
@ -92,7 +92,7 @@ kubectl exec deploy/sleep -- curl -sS -v auto.internal
 ENDSNIP

 snip_external_tcp_services_without_vips_1() {
-cat <<EOF | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+cat <<EOF | istioctl install -y -f -
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
--- a/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh
+++ b/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh
@ -31,7 +31,7 @@ spec:
      gatewayTopology:
        numTrustedProxies: 2
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f topology.yaml
+istioctl install -f topology.yaml
 }

 snip_create_httpbin_namespace() {
--- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
+++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
@ -83,7 +83,7 @@ status:
 ENDSNIP

 snip_install_with_custom_config_analysis() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set values.global.istiod.enableAnalysis=true
+istioctl install --set values.global.istiod.enableAnalysis=true
 }

 snip_analyze_k_frod() {
--- a/content/en/docs/ops/integrations/spire/snips.sh
+++ b/content/en/docs/ops/integrations/spire/snips.sh
@ -176,7 +176,7 @@ EOF
 }

 snip_apply_istio_operator_configuration() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --skip-confirmation -f ./istio.yaml
+istioctl install --skip-confirmation -f ./istio.yaml
 }

 snip_apply_sleep() {
--- a/content/en/docs/setup/additional-setup/cni/snips.sh
+++ b/content/en/docs/setup/additional-setup/cni/snips.sh
@ -30,7 +30,7 @@ spec:
      namespace: istio-system
      enabled: true
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f istio-cni.yaml -y
+istioctl install -f istio-cni.yaml -y
 }

 snip_cni_agent_helm_install() {
--- a/content/en/docs/setup/additional-setup/gateway/snips.sh
+++ b/content/en/docs/setup/additional-setup/gateway/snips.sh
@ -45,7 +45,7 @@ ENDSNIP

 snip_deploying_a_gateway_2() {
 kubectl create namespace istio-ingress
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f ingress.yaml
+istioctl install -f ingress.yaml
 }

 snip_deploying_a_gateway_3() {
--- a/content/en/docs/setup/additional-setup/getting-started-istio-apis/snips.sh
+++ b/content/en/docs/setup/additional-setup/getting-started-istio-apis/snips.sh
@ -34,7 +34,7 @@ export PATH=$PWD/bin:$PATH
 }

 snip_install_istio_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=demo -y
+istioctl install --set profile=demo -y
 }

 ! IFS=$'\n' read -r -d '' snip_install_istio_1_out <<\ENDSNIP
--- a/content/en/docs/setup/additional-setup/pod-security-admission/snips.sh
+++ b/content/en/docs/setup/additional-setup/pod-security-admission/snips.sh
@ -32,7 +32,7 @@ namespace/istio-system labeled
 ENDSNIP

 snip_install_istio_with_psa_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set components.cni.enabled=true -y
+istioctl install --set components.cni.enabled=true -y
 }

 ! IFS=$'\n' read -r -d '' snip_install_istio_with_psa_2_out <<\ENDSNIP
--- a/content/en/docs/setup/getting-started/snips.sh
+++ b/content/en/docs/setup/getting-started/snips.sh
@ -30,7 +30,7 @@ export PATH=$PWD/bin:$PATH
 }

 snip_install_istio_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f samples/bookinfo/demo-profile-no-gateways.yaml -y
+istioctl install -f samples/bookinfo/demo-profile-no-gateways.yaml -y
 }

 ! IFS=$'\n' read -r -d '' snip_install_istio_1_out <<\ENDSNIP
--- a/content/en/docs/setup/install/external-controlplane/snips.sh
+++ b/content/en/docs/setup/install/external-controlplane/snips.sh
@ -47,7 +47,7 @@ EOF
 }

 snip_set_up_a_gateway_in_the_external_cluster_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f controlplane-gateway.yaml --context="${CTX_EXTERNAL_CLUSTER}"
+istioctl install -f controlplane-gateway.yaml --context="${CTX_EXTERNAL_CLUSTER}"
 }

 snip_set_up_a_gateway_in_the_external_cluster_3() {
@ -218,7 +218,7 @@ sed  -i'.bk' \
 }

 snip_set_up_the_control_plane_in_the_external_cluster_5() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f external-istiod.yaml --context="${CTX_EXTERNAL_CLUSTER}"
+istioctl install -f external-istiod.yaml --context="${CTX_EXTERNAL_CLUSTER}"
 }

 snip_set_up_the_control_plane_in_the_external_cluster_6() {
@ -372,7 +372,7 @@ spec:
      istio-ingressgateway:
        injectionTemplate: gateway
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f istio-ingressgateway.yaml --set values.global.istioNamespace=external-istiod --context="${CTX_REMOTE_CLUSTER}"
+istioctl install -f istio-ingressgateway.yaml --set values.global.istioNamespace=external-istiod --context="${CTX_REMOTE_CLUSTER}"
 }

 snip_enable_gateways_2() {
@ -397,7 +397,7 @@ spec:
      istio-egressgateway:
        injectionTemplate: gateway
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f istio-egressgateway.yaml --set values.global.istioNamespace=external-istiod --context="${CTX_REMOTE_CLUSTER}"
+istioctl install -f istio-egressgateway.yaml --set values.global.istioNamespace=external-istiod --context="${CTX_REMOTE_CLUSTER}"
 }

 snip_enable_gateways_4() {
--- a/content/en/docs/setup/install/multicluster/multi-primary/snips.sh
+++ b/content/en/docs/setup/install/multicluster/multi-primary/snips.sh
@ -35,7 +35,7 @@ EOF
 }

 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }

 snip_configure_cluster2_as_a_primary_1() {
@ -53,7 +53,7 @@ EOF
 }

 snip_configure_cluster2_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER2}" -f cluster2.yaml
+istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
 }

 snip_enable_endpoint_discovery_1() {
--- a/content/en/docs/setup/install/multicluster/multi-primary_multi-network/snips.sh
+++ b/content/en/docs/setup/install/multicluster/multi-primary_multi-network/snips.sh
@ -40,7 +40,7 @@ EOF
 }

 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }

 snip_install_the_eastwest_gateway_in_cluster1_1() {
@ -83,7 +83,7 @@ EOF
 }

 snip_configure_cluster2_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER2}" -f cluster2.yaml
+istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
 }

 snip_install_the_eastwest_gateway_in_cluster2_1() {
--- a/content/en/docs/setup/install/multicluster/primary-remote/snips.sh
+++ b/content/en/docs/setup/install/multicluster/primary-remote/snips.sh
@ -35,7 +35,7 @@ EOF
 }

 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }

 snip_install_the_eastwest_gateway_in_cluster1_1() {
@ -89,7 +89,7 @@ EOF
 }

 snip_configure_cluster2_as_a_remote_3() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER2}" -f cluster2.yaml
+istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
 }

 snip_attach_cluster2_as_a_remote_cluster_of_cluster1_1() {
--- a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh
+++ b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/snips.sh
@ -40,7 +40,7 @@ EOF
 }

 snip_configure_cluster1_as_a_primary_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
+istioctl install --set values.pilot.env.EXTERNAL_ISTIOD=true --context="${CTX_CLUSTER1}" -f cluster1.yaml
 }

 snip_install_the_eastwest_gateway_in_cluster1_1() {
@ -98,7 +98,7 @@ EOF
 }

 snip_configure_cluster2_as_a_remote_3() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --context="${CTX_CLUSTER2}" -f cluster2.yaml
+istioctl install --context="${CTX_CLUSTER2}" -f cluster2.yaml
 }

 snip_attach_cluster2_as_a_remote_cluster_of_cluster1_1() {
--- a/content/en/docs/setup/install/multiple-controlplanes/snips.sh
+++ b/content/en/docs/setup/install/multiple-controlplanes/snips.sh
@ -23,7 +23,7 @@
 snip_deploying_multiple_control_planes_1() {
 kubectl create ns usergroup-1
 kubectl label ns usergroup-1 usergroup=usergroup-1
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f - <<EOF
+istioctl install -y -f - <<EOF
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 metadata:
@ -44,7 +44,7 @@ EOF
 snip_deploying_multiple_control_planes_2() {
 kubectl create ns usergroup-2
 kubectl label ns usergroup-2 usergroup=usergroup-2
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f - <<EOF
+istioctl install -y -f - <<EOF
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 metadata:
--- a/content/en/docs/setup/install/virtual-machine/snips.sh
+++ b/content/en/docs/setup/install/virtual-machine/snips.sh
@ -62,21 +62,21 @@ EOF
 }

 snip_install_the_istio_control_plane_2() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f vm-cluster.yaml
+istioctl install -f vm-cluster.yaml
 }

 snip_install_istio() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f vm-cluster.yaml --set values.pilot.env.PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION=true --set values.pilot.env.PILOT_ENABLE_WORKLOAD_ENTRY_HEALTHCHECKS=true
+istioctl install -f vm-cluster.yaml --set values.pilot.env.PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION=true --set values.pilot.env.PILOT_ENABLE_WORKLOAD_ENTRY_HEALTHCHECKS=true
 }

 snip_install_eastwest() {
-samples/multicluster/gen-eastwest-gateway.sh --single-cluster | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+samples/multicluster/gen-eastwest-gateway.sh --single-cluster | istioctl install -y -f -
 }

 snip_install_the_istio_control_plane_5() {
 samples/multicluster/gen-eastwest-gateway.sh \
    --network "${CLUSTER_NETWORK}" | \
-    istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+    istioctl install -y -f -
 }

 snip_expose_istio() {
--- a/content/en/docs/setup/upgrade/canary/snips.sh
+++ b/content/en/docs/setup/upgrade/canary/snips.sh
@ -32,7 +32,7 @@ istioctl x precheck
 ENDSNIP

 snip_control_plane_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set revision=canary
+istioctl install --set revision=canary
 }

 snip_control_plane_2() {
@ -98,8 +98,8 @@ istioctl proxy-status | grep "\.test-ns "
 }

 snip_usage_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --revision=1-22-1 --set profile=minimal --skip-confirmation
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --revision=1-23-0 --set profile=minimal --skip-confirmation
+istioctl install --revision=1-22-1 --set profile=minimal --skip-confirmation
+istioctl install --revision=1-23-0 --set profile=minimal --skip-confirmation
 }

 snip_usage_2() {
--- a/content/en/docs/tasks/observability/distributed-tracing/opentelemetry/snips.sh
+++ b/content/en/docs/tasks/observability/distributed-tracing/opentelemetry/snips.sh
@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/start-otel-collector-service.sh"
 source "content/en/boilerplates/snips/trace-generation.sh"

 snip_install_otlp_http() {
-cat <<EOF | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+cat <<EOF | istioctl install -y -f -
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
--- a/content/en/docs/tasks/observability/distributed-tracing/sampling/snips.sh
+++ b/content/en/docs/tasks/observability/distributed-tracing/sampling/snips.sh
@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/start-otel-collector-service.sh"
 source "content/en/boilerplates/snips/trace-generation.sh"

 snip_install_default_sampling() {
-cat <<EOF | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+cat <<EOF | istioctl install -y -f -
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
@ -57,7 +57,7 @@ EOF
 }

 snip_install_without_sampling() {
-cat <<EOF | istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -y -f -
+cat <<EOF | istioctl install -y -f -
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 spec:
--- a/content/en/docs/tasks/observability/distributed-tracing/telemetry-api/snips.sh
+++ b/content/en/docs/tasks/observability/distributed-tracing/telemetry-api/snips.sh
@ -36,7 +36,7 @@ spec:
        service: zipkin.istio-system.svc.cluster.local
        port: 9411
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f ./tracing.yaml --skip-confirmation
+istioctl install -f ./tracing.yaml --skip-confirmation
 }

 snip_enable_tracing_for_mesh_1() {
--- a/content/en/docs/tasks/observability/logs/access-log/snips.sh
+++ b/content/en/docs/tasks/observability/logs/access-log/snips.sh
@ -88,7 +88,7 @@ kubectl delete -f samples/httpbin/httpbin.yaml
 }

 snip_disable_envoys_access_logging_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=default
+istioctl install --set profile=default
 }

 ! IFS=$'\n' read -r -d '' snip_disable_envoys_access_logging_1_out <<\ENDSNIP
--- a/content/en/docs/tasks/observability/logs/otel-provider/snips.sh
+++ b/content/en/docs/tasks/observability/logs/otel-provider/snips.sh
@ -131,7 +131,7 @@ kubectl delete namespace observability
 }

 snip_disable_envoys_access_logging_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=default
+istioctl install --set profile=default
 }

 ! IFS=$'\n' read -r -d '' snip_disable_envoys_access_logging_1_out <<\ENDSNIP
--- a/content/en/docs/tasks/observability/logs/telemetry-api/snips.sh
+++ b/content/en/docs/tasks/observability/logs/telemetry-api/snips.sh
@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/before-you-begin-egress.sh"
 source "content/en/boilerplates/snips/start-httpbin-service.sh"

 snip_install_loki() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f samples/open-telemetry/loki/iop.yaml --skip-confirmation
+istioctl install -f samples/open-telemetry/loki/iop.yaml --skip-confirmation
 kubectl apply -f samples/addons/loki.yaml -n istio-system
 kubectl apply -f samples/open-telemetry/loki/otel.yaml -n istio-system
 }
--- a/content/en/docs/tasks/security/authentication/authn-policy/snips.sh
+++ b/content/en/docs/tasks/security/authentication/authn-policy/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=default
+istioctl install --set profile=default
 }

 snip_setup_1() {
--- a/content/en/docs/tasks/security/authorization/authz-td-migration/snips.sh
+++ b/content/en/docs/tasks/security/authorization/authz-td-migration/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=demo --set meshConfig.trustDomain=old-td
+istioctl install --set profile=demo --set meshConfig.trustDomain=old-td
 }

 snip_before_you_begin_2() {
@ -74,7 +74,7 @@ kubectl exec "$(kubectl -n sleep-allow get pod -l app=sleep -o jsonpath={.items.
 ENDSNIP

 snip_migrate_trust_domain_without_trust_domain_aliases_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=demo --set meshConfig.trustDomain=new-td
+istioctl install --set profile=demo --set meshConfig.trustDomain=new-td
 }

 snip_migrate_trust_domain_without_trust_domain_aliases_2() {
@ -115,7 +115,7 @@ spec:
    trustDomainAliases:
      - old-td
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=demo -f td-installation.yaml -y
+istioctl install --set profile=demo -f td-installation.yaml -y
 }

 snip_migrate_trust_domain_with_trust_domain_aliases_2() {
--- a/content/en/docs/tasks/security/cert-management/custom-ca-k8s/snips.sh
+++ b/content/en/docs/tasks/security/cert-management/custom-ca-k8s/snips.sh
@ -186,7 +186,7 @@ $BARCA
                  verbs:
                  - approve
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --skip-confirmation -f ./istio.yaml
+istioctl install --skip-confirmation -f ./istio.yaml
 }

 snip_deploy_istio_with_default_certsigner_info_2() {
--- a/content/en/docs/tasks/security/cert-management/plugin-ca-cert/snips.sh
+++ b/content/en/docs/tasks/security/cert-management/plugin-ca-cert/snips.sh
@ -47,7 +47,7 @@ popd
 }

 snip_deploy_istio_1() {
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true --set profile=demo
+istioctl install --set profile=demo
 }

 snip_deploying_example_services_1() {
--- a/content/en/docs/tasks/security/tls-configuration/workload-min-tls-version/snips.sh
+++ b/content/en/docs/tasks/security/tls-configuration/workload-min-tls-version/snips.sh
@ -29,7 +29,7 @@ spec:
    meshMTLS:
      minProtocolVersion: TLSV1_3
 EOF
-istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true -f ./istio.yaml
+istioctl install -f ./istio.yaml
 }

 snip_check_the_tls_configuration_of_istio_workloads_1() {
--- a/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/snips.sh
+++ b/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/snips.sh
@ -42,7 +42,7 @@ OpenSSL 1.1.1g  21 Apr 2020
 ENDSNIP

 ! IFS=$'\n' read -r -d '' snip_before_you_begin_5 <<\ENDSNIP
-$ istioctl install --set values.pilot.env.PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING=true <flags-you-used-to-install-Istio> --set meshConfig.accessLogFile=/dev/stdout
+$ istioctl install <flags-you-used-to-install-Istio> --set meshConfig.accessLogFile=/dev/stdout
 ENDSNIP

 snip_perform_tls_origination_with_an_egress_gateway_1() {
--- 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 <flags-you-used-to-install-Istio> --set meshConfig.accessLogFile=/dev/stdout
+$ istioctl install <flags-you-used-to-install-Istio> --set meshConfig.accessLogFile=/dev/stdout
 ENDSNIP

 snip_deploy_istio_egress_gateway_1() {
--- 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
--- 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() {
--- 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() {
--- 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() {
--- 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)
--- 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:
--- 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:
--- 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
 `
 }
--- 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
 `
 }
--- 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: