From f23fcb5fb0d3989da4ad0464019d6fc206fdfdf3 Mon Sep 17 00:00:00 2001
From: Shamsher Ansari <shaansar@redhat.com>
Date: Mon, 22 Mar 2021 19:59:35 +0530
Subject: [PATCH] Rename Service APIs to Gateway API (#9347)

* Rename Service APIs to Gateway API

* update alias

Co-authored-by: craigbox <craigbox@google.com>

* fix missing url

Co-authored-by: craigbox <craigbox@google.com>
---
 content/en/about/feature-stages/index.md       |  2 +-
 .../{service-apis => gateway-api}/index.md     | 18 ++++++++++--------
 .../{service-apis => gateway-api}/snips.sh     |  4 ++--
 .../{service-apis => gateway-api}/test.sh      |  0
 .../releases/1.9.x/announcing-1.9/_index.md    |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)
 rename content/en/docs/tasks/traffic-management/ingress/{service-apis => gateway-api}/index.md (83%)
 rename content/en/docs/tasks/traffic-management/ingress/{service-apis => gateway-api}/snips.sh (93%)
 rename content/en/docs/tasks/traffic-management/ingress/{service-apis => gateway-api}/test.sh (100%)

diff --git a/content/en/about/feature-stages/index.md b/content/en/about/feature-stages/index.md
index 622fb46b68..01bd03d85e 100644
--- a/content/en/about/feature-stages/index.md
+++ b/content/en/about/feature-stages/index.md
@@ -44,7 +44,7 @@ Below is our list of existing features and their current phases. This informatio
 | CNI container interface | Alpha
 | [Sidecar API](/docs/reference/config/networking/sidecar/) | Beta
 | [DNS Proxying](/docs/ops/configuration/traffic-management/dns-proxy/) | Alpha
-| [Kubernetes service-apis](/docs/tasks/traffic-management/ingress/service-apis/) | Alpha
+| [Kubernetes service-apis](/docs/tasks/traffic-management/ingress/gateway-api/) | Alpha
 
 ### Observability
 
diff --git a/content/en/docs/tasks/traffic-management/ingress/service-apis/index.md b/content/en/docs/tasks/traffic-management/ingress/gateway-api/index.md
similarity index 83%
rename from content/en/docs/tasks/traffic-management/ingress/service-apis/index.md
rename to content/en/docs/tasks/traffic-management/ingress/gateway-api/index.md
index 0345bb2550..e78712d76b 100644
--- a/content/en/docs/tasks/traffic-management/ingress/service-apis/index.md
+++ b/content/en/docs/tasks/traffic-management/ingress/gateway-api/index.md
@@ -1,25 +1,27 @@
 ---
-title: Kubernetes Service APIs
-description: Describes how to configure the Kubernetes Service APIs with Istio.
+title: Kubernetes Gateway API
+description: Describes how to configure the Kubernetes Gateway API with Istio.
 weight: 50
+aliases:
+    - /docs/tasks/traffic-management/ingress/service-apis/
 keywords: [traffic-management,ingress]
 owner: istio/wg-networking-maintainers
 test: yes
 ---
 
-This task describes how to configure Istio to expose a service outside of the service mesh cluster, using the Kubernetes [Service APIs](https://kubernetes-sigs.github.io/gateway-api/).
+This task describes how to configure Istio to expose a service outside of the service mesh cluster, using the Kubernetes [Gateway API](https://gateway-api.sigs.k8s.io/).
 These APIs are an actively developed evolution of the Kubernetes [Service](https://kubernetes.io/docs/concepts/services-networking/service/)
 and [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) APIs.
 
 ## Setup
 
-1. Install the Service APIs CRDs:
+1. Install the Gateway API CRDs:
 
     {{< text bash >}}
-    $ kubectl kustomize "github.com/kubernetes-sigs/service-apis/config/crd?ref=v0.1.0" | kubectl apply -f -
+    $ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.2.0" | kubectl apply -f -
     {{< /text >}}
 
-1. Install Istio, or reconfigure an existing installation to enable the Service APIs controller:
+1. Install Istio, or reconfigure an existing installation to enable the Gateway API controller:
 
     {{< text bash >}}
     $ istioctl install --set values.pilot.env.PILOT_ENABLED_SERVICE_APIS=true
@@ -29,7 +31,7 @@ and [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/)
 
 ## Configuring a Gateway
 
-See the [Service APIs](https://kubernetes-sigs.github.io/gateway-api/) documentation for information about the APIs.
+See the [Gateway API](https://gateway-api.sigs.k8s.io/) documentation for information about the APIs.
 
 1. Deploy a test application:
 
@@ -37,7 +39,7 @@ See the [Service APIs](https://kubernetes-sigs.github.io/gateway-api/) documenta
     $ kubectl apply -f @samples/httpbin/httpbin.yaml@
     {{< /text >}}
 
-1. Deploy the Service APIs configuration:
+1. Deploy the Gateway API configuration:
 
     {{< text bash >}}
     $ kubectl apply -f - <<EOF
diff --git a/content/en/docs/tasks/traffic-management/ingress/service-apis/snips.sh b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
similarity index 93%
rename from content/en/docs/tasks/traffic-management/ingress/service-apis/snips.sh
rename to content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
index dea11d0a0c..85bfbdf130 100644
--- a/content/en/docs/tasks/traffic-management/ingress/service-apis/snips.sh
+++ b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
@@ -17,11 +17,11 @@
 
 ####################################################################################################
 # WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE:
-#          docs/tasks/traffic-management/ingress/service-apis/index.md
+#          docs/tasks/traffic-management/ingress/gateway-api/index.md
 ####################################################################################################
 
 snip_setup_1() {
-kubectl kustomize "github.com/kubernetes-sigs/service-apis/config/crd?ref=v0.1.0" | kubectl apply -f -
+kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.2.0" | kubectl apply -f -
 }
 
 snip_setup_2() {
diff --git a/content/en/docs/tasks/traffic-management/ingress/service-apis/test.sh b/content/en/docs/tasks/traffic-management/ingress/gateway-api/test.sh
similarity index 100%
rename from content/en/docs/tasks/traffic-management/ingress/service-apis/test.sh
rename to content/en/docs/tasks/traffic-management/ingress/gateway-api/test.sh
diff --git a/content/en/news/releases/1.9.x/announcing-1.9/_index.md b/content/en/news/releases/1.9.x/announcing-1.9/_index.md
index c75e690376..e93ec2ea50 100644
--- a/content/en/news/releases/1.9.x/announcing-1.9/_index.md
+++ b/content/en/news/releases/1.9.x/announcing-1.9/_index.md
@@ -58,9 +58,9 @@ Istio continues to make mesh telemetry collection more configurable. In this rel
 [Request Classification](/docs/tasks/observability/metrics/classify-metrics/) has been promoted to Beta. This feature
 enables users to more precisely understand and monitor the traffic in their service mesh.
 
-## Kubernetes Service API support (Alpha)
+## Kubernetes Gateway API support (Alpha)
 
-Configuring Istio to expose a service using [Kubernetes Service APIs](https://kubernetes-sigs.github.io/service-apis/) has been an active area of development since Istio 1.6, and we are pleased to announce support for them as Alpha in 1.9. Using these APIs benefits users who move between other service meshes that support these APIs. To try them out, check out the [Service API's getting started documentation](/docs/tasks/traffic-management/ingress/service-apis/).
+Configuring Istio to expose a service using [Kubernetes Gateway API](https://gateway-api.sigs.k8s.io/) has been an active area of development since Istio 1.6, and we are pleased to announce support for them as Alpha in 1.9. Using these APIs benefits users who move between other service meshes that support these APIs. To try them out, check out the [Gateway API getting started documentation](/docs/tasks/traffic-management/ingress/gateway-api/).
 
 We are eager to evolve these CRDs in partnership with the Kubernetes community, notably the
 [Kubernetes SIG-NETWORK group](https://github.com/kubernetes/community/tree/master/sig-network), in upcoming releases to