Skip to content

Commit 5e041a8

Browse files
authored
Apply maintainer feedback
1 parent 8db926f commit 5e041a8

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

content/en/docs/concepts/services-networking/ingress-controllers.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ title: Ingress Controllers
33
description: >-
44
In order for an [Ingress](/docs/concepts/services-networking/ingress/) to work in your cluster,
55
there must be an _ingress controller_ running.
6-
You need to select at least one ingress controller and make sure it is set up in your cluster.
6+
You need to select at least one ingress controller and make sure it is set up in your cluster.
77
This page lists common ingress controllers that you can deploy.
88
content_type: concept
99
weight: 50
1010
---
1111

1212
{{< note >}}
13+
The Kubernetes project recommends using [Gateway](https://gateway-api.sigs.k8s.io/) instead of
14+
[Ingress](/docs/concepts/services-networking/ingress/).
1315
The Ingress API has been frozen.
1416

1517
This means that:
16-
* The Ingress API will not be removed.
18+
* The Ingress API is generally available, and is subject to the [stability guarantees](/docs/reference/using-api/deprecation-policy/#deprecating-parts-of-the-api) for generally available APIs.
19+
The Kubernetes project has no plans to remove Ingress from Kubernetes.
1720
* The Ingress API is no longer being developed, and will have no further changes
1821
or updates made to it.
1922
{{< /note >}}
@@ -22,14 +25,6 @@ This means that:
2225

2326
<!-- overview -->
2427

25-
## Preferred Option: Gateway API
26-
27-
[Gateway API](/docs/concepts/services-networking/gateway/) is stable and
28-
includes many more features (and implementations). Instead of relying on an
29-
assortment of implementation-specific annotations, Gateway API allows you to
30-
use a broad set of Core APIs with a wide variety of implementations. Unlike
31-
Ingress, Gateway API is still under active development and continues to gain
32-
new capabilities with each release.
3328

3429
## Ingress controllers
3530

content/en/docs/concepts/services-networking/ingress.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,19 @@ weight: 30
2222
{{< glossary_definition term_id="ingress" length="all" >}}
2323

2424
{{< note >}}
25+
The Kubernetes project recommends using [Gateway](https://gateway-api.sigs.k8s.io/) instead of
26+
[Ingress](/docs/concepts/services-networking/ingress/).
2527
The Ingress API has been frozen.
2628

2729
This means that:
28-
* The Ingress API will not be removed.
30+
* The Ingress API is generally available, and is subject to the [stability guarantees](/docs/reference/using-api/deprecation-policy/#deprecating-parts-of-the-api) for generally available APIs.
31+
The Kubernetes project has no plans to remove Ingress from Kubernetes.
2932
* The Ingress API is no longer being developed, and will have no further changes
3033
or updates made to it.
3134
{{< /note >}}
3235

3336
<!-- body -->
3437

35-
## Preferred Option: Gateway API
36-
37-
[Gateway API](/docs/concepts/services-networking/gateway/) is stable and
38-
includes many more features (and implementations). Instead of relying on an
39-
assortment of implementation-specific annotations, Gateway API allows you to
40-
use a broad set of Core APIs with a wide variety of implementations. Unlike
41-
Ingress, Gateway API is still under active development and continues to gain
42-
new capabilities with each release.
4338

4439
## Terminology
4540

0 commit comments

Comments
 (0)