diff --git a/content/en/boilerplates/gateway-api-gamma-support.md b/content/en/boilerplates/gateway-api-gamma-experimental.md similarity index 87% rename from content/en/boilerplates/gateway-api-gamma-support.md rename to content/en/boilerplates/gateway-api-gamma-experimental.md index a545dcac52..04ff23250f 100644 --- a/content/en/boilerplates/gateway-api-gamma-support.md +++ b/content/en/boilerplates/gateway-api-gamma-experimental.md @@ -6,10 +6,8 @@ {{< /tip >}} {{< warning >}} -This document configures internal mesh (east-west) traffic -that requires Gateway API features that are either +This document configures Istio using Gateway API features that are [experimental](https://gateway-api.sigs.k8s.io/geps/overview/#status) -or Istio specific. Before using the Gateway API instructions, make sure to: 1) Install the **experimental version** of the Gateway API CRDs: diff --git a/content/en/boilerplates/snips/gateway-api-experimental.sh b/content/en/boilerplates/snips/gateway-api-experimental.sh deleted file mode 100644 index 7b7fb577b9..0000000000 --- a/content/en/boilerplates/snips/gateway-api-experimental.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2034,SC2153,SC2155,SC2164 - -# Copyright Istio Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#################################################################################################### -# WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: -# boilerplates/gateway-api-experimental.md -#################################################################################################### - -bpsnip_gateway_api_experimental_install_experimental_crds() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=444631bfe06f3bcca5d0eadf1857eac1d369421d" | kubectl apply -f - -} diff --git a/content/en/boilerplates/snips/gateway-api-gamma-support.sh b/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh similarity index 87% rename from content/en/boilerplates/snips/gateway-api-gamma-support.sh rename to content/en/boilerplates/snips/gateway-api-gamma-experimental.sh index 0529e2a9b5..2459025cb8 100644 --- a/content/en/boilerplates/snips/gateway-api-gamma-support.sh +++ b/content/en/boilerplates/snips/gateway-api-gamma-experimental.sh @@ -17,13 +17,13 @@ #################################################################################################### # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: -# boilerplates/gateway-api-gamma-support.md +# boilerplates/gateway-api-gamma-experimental.md #################################################################################################### -bpsnip_gateway_api_gamma_support_install_experimental_crds() { +bpsnip_gateway_api_gamma_experimental_install_experimental_crds() { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl apply -f - } -bpsnip_gateway_api_gamma_support_enable_alpha_crds() { +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 } diff --git a/content/en/docs/tasks/traffic-management/egress/egress-control/index.md b/content/en/docs/tasks/traffic-management/egress/egress-control/index.md index b8a4ed1bc4..370d24e4a3 100644 --- a/content/en/docs/tasks/traffic-management/egress/egress-control/index.md +++ b/content/en/docs/tasks/traffic-management/egress/egress-control/index.md @@ -257,7 +257,7 @@ Similar to inter-cluster requests, routing rules can also be configured for external services that are accessed using `ServiceEntry` configurations. In this example, you set a timeout rule on calls to the `httpbin.org` service. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} 1) From inside the pod being used as the test source, make a _curl_ request to the `/delay` endpoint of the httpbin.org external service: diff --git a/content/en/docs/tasks/traffic-management/egress/egress-control/snips.sh b/content/en/docs/tasks/traffic-management/egress/egress-control/snips.sh index 90601ae23c..da0a9712fd 100644 --- a/content/en/docs/tasks/traffic-management/egress/egress-control/snips.sh +++ b/content/en/docs/tasks/traffic-management/egress/egress-control/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/egress/egress-control/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_before_you_begin_1() { kubectl apply -f samples/sleep/sleep.yaml diff --git a/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md b/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md index e3b9de5cc0..698e8b5702 100644 --- a/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md +++ b/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md @@ -19,7 +19,7 @@ dedicated _egress gateway_ service. This example combines the previous two by describing how to configure an egress gateway to perform TLS origination for traffic to external services. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} ## Before you begin diff --git 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 index 42cbe0f2c7..0aa04e2ee1 100644 --- 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 @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_before_you_begin_1() { kubectl apply -f samples/sleep/sleep.yaml diff --git a/content/en/docs/tasks/traffic-management/egress/egress-gateway/index.md b/content/en/docs/tasks/traffic-management/egress/egress-gateway/index.md index 121e76b563..dffdb3ec35 100644 --- a/content/en/docs/tasks/traffic-management/egress/egress-gateway/index.md +++ b/content/en/docs/tasks/traffic-management/egress/egress-gateway/index.md @@ -37,7 +37,7 @@ on them cannot access the Internet. Defining an egress gateway, directing all th allocating public IPs to the egress gateway nodes allows the application nodes to access external services in a controlled way. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-gamma-experimental >}} ## Before you begin 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 e15228cc8e..ee0c33a94e 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 @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/egress/egress-gateway/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-gamma-experimental.sh" snip_before_you_begin_1() { kubectl apply -f samples/sleep/sleep.yaml diff --git a/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md b/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md index 0ca87b6824..6cad8aadbc 100644 --- a/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md +++ b/content/en/docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md @@ -23,7 +23,7 @@ Each version of `wikipedia.org` in a particular language has its own hostname, e You want to enable egress traffic by common configuration items for all the Wikipedia sites, without the need to specify every language's site separately. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} ## Before you begin 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 7c773ff7c2..fe50cdef1e 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 @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/egress/wildcard-egress-hosts/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +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 diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/gtwapi_test.sh b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/gtwapi_test.sh index 4da7f79cf0..50002094a7 100644 --- a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/gtwapi_test.sh +++ b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/gtwapi_test.sh @@ -19,8 +19,8 @@ source "tests/util/gateway-api.sh" install_gateway_api_crds # @setup profile=none -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" -bpsnip_gateway_api_gamma_support_enable_alpha_crds +source "content/en/boilerplates/snips/gateway-api-gamma-experimental.sh" +bpsnip_gateway_api_gamma_experimental_enable_alpha_crds source "content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/test.sh" # @cleanup diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/index.md b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/index.md index 620de4e120..f361bb1163 100644 --- a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/index.md +++ b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/index.md @@ -17,7 +17,7 @@ The example HTTPS service used for this task is a simple [NGINX](https://www.ngi In the following steps you first deploy the NGINX service in your Kubernetes cluster. Then you configure a gateway to provide ingress access to the service via host `nginx.example.com`. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-gamma-experimental >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/snips.sh b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/snips.sh index 7225ef507e..0c3cb982d5 100644 --- a/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/snips.sh +++ b/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/ingress/ingress-sni-passthrough/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-gamma-experimental.sh" snip_generate_client_and_server_certificates_and_keys_1() { mkdir example_certs diff --git a/content/en/docs/tasks/traffic-management/mirroring/index.md b/content/en/docs/tasks/traffic-management/mirroring/index.md index de207e9b11..84b8f8bc35 100644 --- a/content/en/docs/tasks/traffic-management/mirroring/index.md +++ b/content/en/docs/tasks/traffic-management/mirroring/index.md @@ -17,7 +17,7 @@ traffic happens out of band of the critical request path for the primary service In this task, you will first force all traffic to `v1` of a test service. Then, you will apply a rule to mirror a portion of traffic to `v2`. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/mirroring/snips.sh b/content/en/docs/tasks/traffic-management/mirroring/snips.sh index 0229f52fe4..f4a7f2b35e 100644 --- a/content/en/docs/tasks/traffic-management/mirroring/snips.sh +++ b/content/en/docs/tasks/traffic-management/mirroring/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/mirroring/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_before_you_begin_1() { cat <}} +{{< boilerplate gateway-api-support >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/request-routing/snips.sh b/content/en/docs/tasks/traffic-management/request-routing/snips.sh index 71033aabd3..939060f098 100644 --- a/content/en/docs/tasks/traffic-management/request-routing/snips.sh +++ b/content/en/docs/tasks/traffic-management/request-routing/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/request-routing/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_route_to_version_1_1() { kubectl apply -f samples/bookinfo/networking/virtual-service-all-v1.yaml diff --git a/content/en/docs/tasks/traffic-management/request-timeouts/index.md b/content/en/docs/tasks/traffic-management/request-timeouts/index.md index 3700cb3a7c..ec17b172c6 100644 --- a/content/en/docs/tasks/traffic-management/request-timeouts/index.md +++ b/content/en/docs/tasks/traffic-management/request-timeouts/index.md @@ -11,7 +11,7 @@ test: yes This task shows you how to set up request timeouts in Envoy using Istio. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/request-timeouts/snips.sh b/content/en/docs/tasks/traffic-management/request-timeouts/snips.sh index 70095a4854..58df99d2a1 100644 --- a/content/en/docs/tasks/traffic-management/request-timeouts/snips.sh +++ b/content/en/docs/tasks/traffic-management/request-timeouts/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/request-timeouts/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_request_timeouts_1() { kubectl apply -f - <}} +{{< boilerplate gateway-api-gamma-experimental >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh index 7caa85a5c7..9467327931 100644 --- a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh +++ b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/tcp-traffic-shifting/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-gamma-experimental.sh" snip_set_up_the_test_environment_1() { kubectl create namespace istio-io-tcp-traffic-shifting diff --git a/content/en/docs/tasks/traffic-management/traffic-shifting/index.md b/content/en/docs/tasks/traffic-management/traffic-shifting/index.md index 219be8ca92..cf09505fe1 100644 --- a/content/en/docs/tasks/traffic-management/traffic-shifting/index.md +++ b/content/en/docs/tasks/traffic-management/traffic-shifting/index.md @@ -18,7 +18,7 @@ from one destination to another. In this task, you will use send 50% of traffic to `reviews:v1` and 50% to `reviews:v3`. Then, you will complete the migration by sending 100% of traffic to `reviews:v3`. -{{< boilerplate gateway-api-gamma-support >}} +{{< boilerplate gateway-api-support >}} ## Before you begin diff --git a/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh b/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh index a8527ed4c3..d42fc4b48e 100644 --- a/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh +++ b/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh @@ -19,7 +19,7 @@ # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE: # docs/tasks/traffic-management/traffic-shifting/index.md #################################################################################################### -source "content/en/boilerplates/snips/gateway-api-gamma-support.sh" +source "content/en/boilerplates/snips/gateway-api-support.sh" snip_config_all_v1() { kubectl apply -f samples/bookinfo/networking/virtual-service-all-v1.yaml