Skip to content

Commit de9d224

Browse files
robscottrobscott
committed
Addressing PR feedback
1 parent f476c2c commit de9d224

File tree

2 files changed

+46
-31
lines changed

2 files changed

+46
-31
lines changed

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

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,34 @@ content_type: concept
99
weight: 50
1010
---
1111

12-
{{< warning >}}
12+
{{< note >}}
1313
The Ingress API has been frozen.
14-
{{< /warning >}}
14+
15+
This means that:
16+
* The Ingress API will not be removed.
17+
* The Ingress API is no longer being developed, and will have no further changes
18+
or updates made to it.
19+
{{< /note >}}
1520

1621
<!-- body -->
1722

1823
<!-- overview -->
1924

2025
## Consider using Gateway API
21-
[Gateway API](/docs/concepts/services-networking/gateway/) is GA and includes
22-
many more features (and controllers). The following table highlights some of the
23-
differences between the APIs:
24-
25-
| | Ingress | Gateway API |
26+
[Gateway API](/docs/concepts/services-networking/gateway/) is stable and
27+
includes many more features (and controllers). The following table highlights
28+
some of the differences between the APIs. Note that many implementations extend
29+
these APIs with implementation-specific features, this table focuses on portable
30+
features that are included directly within each Kubernetes API:
31+
32+
{{< table caption = "Comparing Ingress API and Gateway API" >}}
33+
| | Ingress API | Gateway API |
2634
| - | - | - |
27-
| GA | ✅ Yes | ✅ Yes |
35+
| Stable (v1) | ✅ Yes | ✅ Yes |
2836
| Basic HTTP path matching | ✅ Yes | ✅ Yes |
2937
| Traffic Splitting | ❌ No | ✅ Yes |
30-
| More Protocols (gRPC, TLS) | ❌ No | ✅ Yes |
31-
| More Matchers (Headers, Query Params, Methods) | ❌ No | ✅ Yes |
38+
| Protocols | 🟡 HTTP(S) | ✅ HTTP(S), gRPC, TLS |
39+
| Advanced Matchers (Headers, Query Params, Methods) | ❌ No | ✅ Yes |
3240
| Redirects | ❌ No | ✅ Yes |
3341
| Rewrites | ❌ No | ✅ Yes |
3442
| TLS Validation | ❌ No | ✅ Yes |
@@ -37,18 +45,17 @@ differences between the APIs:
3745
| Service Mesh Support | ❌ No | ✅ Yes |
3846
| More Features in Development | ❌ No | ✅ Yes |
3947
| Conformance Tests | 🟡 Some | ✅ Thorough |
40-
| # of Implementations | ✅ [33](/docs/concepts/services-networking/ingress-controllers) | ✅ [34](https://gateway-api.sigs.k8s.io/implementations/) |
41-
48+
| # of Implementations | ✅ [30+](/docs/concepts/services-networking/ingress-controllers) | ✅ [30+](https://gateway-api.sigs.k8s.io/implementations/) |
49+
{{</ table >}}
4250

43-
## Ingress Controllers
51+
## Ingress controllers
4452

45-
Kubernetes as a project supports and maintains [AWS](https://github.com/kubernetes-sigs/aws-load-balancer-controller#readme), [GCE](https://git.k8s.io/ingress-gce/README.md#readme), and
46-
[nginx](https://git.k8s.io/ingress-nginx/README.md#readme) ingress controllers.
53+
Kubernetes as a project supports and maintains [AWS](https://github.com/kubernetes-sigs/aws-load-balancer-controller#readme), and [GCE](https://git.k8s.io/ingress-gce/README.md#readme) ingress controllers.
4754

4855

4956
<!-- body -->
5057

51-
## Additional Controllers
58+
## Additional controllers
5259

5360
{{% thirdparty-content %}}
5461

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,32 @@ weight: 30
2121
{{< feature-state for_k8s_version="v1.19" state="stable" >}}
2222
{{< glossary_definition term_id="ingress" length="all" >}}
2323

24-
{{< warning >}}
24+
{{< note >}}
2525
The Ingress API has been frozen.
26-
{{< /warning >}}
26+
27+
This means that:
28+
* The Ingress API will not be removed.
29+
* The Ingress API is no longer being developed, and will have no further changes
30+
or updates made to it.
31+
{{< /note >}}
2732

2833
<!-- body -->
2934

3035
## Consider using Gateway API
31-
[Gateway API](/docs/concepts/services-networking/gateway/) is GA and includes
32-
many more features. The following table highlights some of the differences
33-
between the APIs:
34-
35-
| | Ingress | Gateway API |
36+
[Gateway API](/docs/concepts/services-networking/gateway/) is stable and
37+
includes many more features (and controllers). The following table highlights
38+
some of the differences between the APIs. Note that many implementations extend
39+
these APIs with implementation-specific features, this table focuses on portable
40+
features that are included directly within each Kubernetes API:
41+
42+
{{< table caption = "Comparing Ingress API and Gateway API" >}}
43+
| | Ingress API | Gateway API |
3644
| - | - | - |
37-
| GA | ✅ Yes | ✅ Yes |
45+
| Stable (v1) | ✅ Yes | ✅ Yes |
3846
| Basic HTTP path matching | ✅ Yes | ✅ Yes |
3947
| Traffic Splitting | ❌ No | ✅ Yes |
40-
| More Protocols (gRPC, TLS) | ❌ No | ✅ Yes |
41-
| More Matchers (Headers, Query Params, Methods) | ❌ No | ✅ Yes |
48+
| Protocols | 🟡 HTTP(S) | ✅ HTTP(S), gRPC, TLS |
49+
| Advanced Matchers (Headers, Query Params, Methods) | ❌ No | ✅ Yes |
4250
| Redirects | ❌ No | ✅ Yes |
4351
| Rewrites | ❌ No | ✅ Yes |
4452
| TLS Validation | ❌ No | ✅ Yes |
@@ -47,8 +55,8 @@ between the APIs:
4755
| Service Mesh Support | ❌ No | ✅ Yes |
4856
| More Features in Development | ❌ No | ✅ Yes |
4957
| Conformance Tests | 🟡 Some | ✅ Thorough |
50-
| # of Implementations | ✅ [30](/docs/concepts/services-networking/ingress-controllers) | ✅ [34](https://gateway-api.sigs.k8s.io/implementations/) |
51-
58+
| # of Implementations | ✅ [30+](/docs/concepts/services-networking/ingress-controllers) | ✅ [30+](https://gateway-api.sigs.k8s.io/implementations/) |
59+
{{</ table >}}
5260

5361
## Terminology
5462

@@ -311,7 +319,7 @@ spec:
311319
312320
{{% /tab %}}
313321
{{% tab name="Namespaced" %}}
314-
{{< feature-state for_k8s_version="v1.23" state="deprecated" >}}
322+
{{< feature-state for_k8s_version="v1.23" state="stable" >}}
315323
316324
If you set the `.spec.parameters` field and set
317325
`.spec.parameters.scope` to `Namespace`, then the IngressClass refers
@@ -389,8 +397,8 @@ IngressClass is marked as default in your cluster.
389397
{{< /caution >}}
390398

391399
There are some ingress controllers, that work without the definition of a
392-
default `IngressClass`. It is recommended though, to specify the default
393-
`IngressClass`:
400+
default IngressClass. It is recommended though, to specify the default
401+
IngressClass:
394402

395403
{{% code_sample file="service/networking/default-ingressclass.yaml" %}}
396404

0 commit comments

Comments
 (0)