Skip to content

Commit

Permalink
Set nginx service-upstream annotation as string (kubernetes#1243)
Browse files Browse the repository at this point in the history
Currently the shown example of a Ingress resource with the service-upstream
annotation is invalid in that the annotations value is a boolean where only
string values are allowed.

This change updates the example to be valid.

Signed-off-by: Crevil <[email protected]>
  • Loading branch information
Crevil authored Nov 23, 2021
1 parent 0acb0eb commit 38172c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions linkerd.io/content/2.10/tasks/using-ingress.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mesh](https://buoyant.io/2021/05/24/emissary-and-linkerd-the-best-of-both-worlds
Nginx can be meshed normally, but the
[`nginx.ingress.kubernetes.io/service-upstream`](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#service-upstream)
annotation should be set to `true`. No further configuration is required.
annotation should be set to `"true"`. No further configuration is required.

```yaml
# apiVersion: networking.k8s.io/v1beta1 # for k8s < v1.19
Expand All @@ -90,7 +90,7 @@ metadata:
name: emojivoto-web-ingress
namespace: emojivoto
annotations:
nginx.ingress.kubernetes.io/service-upstream: true
nginx.ingress.kubernetes.io/service-upstream: "true"
spec:
ingressClassName: nginx
defaultBackend:
Expand Down
4 changes: 2 additions & 2 deletions linkerd.io/content/2.11/tasks/using-ingress.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mesh](https://buoyant.io/2021/05/24/emissary-and-linkerd-the-best-of-both-worlds
Nginx can be meshed normally, but the
[`nginx.ingress.kubernetes.io/service-upstream`](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#service-upstream)
annotation should be set to `true`. No further configuration is required.
annotation should be set to `"true"`. No further configuration is required.

```yaml
# apiVersion: networking.k8s.io/v1beta1 # for k8s < v1.19
Expand All @@ -90,7 +90,7 @@ metadata:
name: emojivoto-web-ingress
namespace: emojivoto
annotations:
nginx.ingress.kubernetes.io/service-upstream: true
nginx.ingress.kubernetes.io/service-upstream: "true"
spec:
ingressClassName: nginx
defaultBackend:
Expand Down

0 comments on commit 38172c3

Please sign in to comment.