Skip to content

Commit d4bfd2e

Browse files
committed
Changes have been made
1 parent cd63d4a commit d4bfd2e

File tree

1 file changed

+12
-46
lines changed

1 file changed

+12
-46
lines changed

content/nic/installation/ingress-nginx.md

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -494,54 +494,20 @@ nginx.com/sticky-cookie-services: "serviceName=example-svc cookie_name expires=t
494494
NGINX Ingress Controller has additional annotations for features using NGINX Plus that have no Ingress-NGINX Controller equivalent, such as active health checks and authentication using JSON Web Tokens (JWTs).
495495
{{< /note >}}
496496

497-
---
498-
499-
The following snippets outline Ingress-NGINX Controller annotations that correspond to annotations for NGINX Ingress Controller with respect to enabling TLS and gRPC on backend (upstream) services.
500-
501-
**Ingress-NGINX Controller**
502-
```yaml
503-
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
504-
```
505-
506-
**NGINX Ingress Controller**
507-
```yaml
508-
nginx.org/ssl-services: "ssl_service_name"
509-
```
510-
511-
---
512-
513-
**Ingress-NGINX Controller**
514-
```yaml
515-
nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
516-
```
517-
518-
**NGINX Ingress Controller**
519-
```yaml
520-
nginx.org/grpc-services: "grpc_service_name"
521-
```
497+
The following table outlines annotation conversions for enabling TLS and gRPC to backend (upstream) services.
522498

523-
{{< note >}}
524-
Requires HTTP/2 (see http2 ConfigMap key) and only works for Ingresses with TLS termination enabled.
525-
{{< /note >}}
526-
527-
---
528-
529-
**Ingress-NGINX Controller**
530-
```yaml
531-
nginx.ingress.kubernetes.io/backend-protocol: "GRPCS"
532-
```
533-
534-
**NGINX Ingress Controller**
535-
```yaml
536-
nginx.org/ssl-services: "grpc_service_name"
537-
nginx.org/grpc-services: "grpc_service_name"
538-
```
539-
540-
{{< note >}}
541-
Requires HTTP/2 (see http2 ConfigMap key) and only works for Ingresses with TLS termination enabled.
542-
{{< /note >}}
499+
{{< bootstrap-table "table table-bordered table-striped table-responsive" >}}
500+
| Ingress-NGINX Controller | NGINX Ingress Controller |
501+
| ------------------------ | ------------------------ |
502+
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "HTTPS" | [_nginx.org/ssl-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "ssl_service_name" |
503+
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "GRPC" | [_nginx.org/grpc-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name" |
504+
| [_nginx.ingress.kubernetes.io/backend-protocol_](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#backend-protocol): "GRPCS" | [_nginx.org/ssl-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name"
505+
[_nginx.org/grpc-services_]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations.md#backend-services-upstreams" >}}): "grpc_service_name" |
543506

544-
---
507+
{{% /bootstrap-table %}}
508+
{{< call-out "important" >}}
509+
GRPC services require Ingresses with TLS termination and HTTP/2 enabled (see [_http2 ConfigMap key_](/nic/configuration/global-configuration/configmap-resource.md#listeners)).
510+
{{< /call-out >}}
545511

546512
### Global configuration with ConfigMaps
547513

0 commit comments

Comments
 (0)