Skip to content

Commit

Permalink
Remove obsolete PILOT_ENABLE_CONFIG_DISTRIBUTION_TRACKING from tests (i…
Browse files Browse the repository at this point in the history
…stio#15676)

This does nothing anymore
  • Loading branch information
howardjohn authored Sep 10, 2024
1 parent fbaf2f3 commit c05f763
Show file tree
Hide file tree
Showing 43 changed files with 55 additions and 61 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion content/en/docs/ambient/getting-started/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion content/en/docs/ambient/install/istioctl/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/ops/integrations/spire/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/setup/additional-setup/cni/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/setup/additional-setup/gateway/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/setup/getting-started/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions content/en/docs/setup/install/external-controlplane/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/setup/install/multiple-controlplanes/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions content/en/docs/setup/install/virtual-machine/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/setup/upgrade/canary/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading

0 comments on commit c05f763

Please sign in to comment.