Skip to content

Commit 3c274c9

Browse files
committed
update docs
Signed-off-by: Haywood Shannon <[email protected]> Signed-off-by: Haywood Shannon <[email protected]>
1 parent eeddabe commit 3c274c9

File tree

6 files changed

+31
-27
lines changed

6 files changed

+31
-27
lines changed

config/crd/bases/k8s.nginx.org_virtualserverroutes.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,12 +1095,13 @@ spec:
10951095
ConfigMap key.
10961096
type: string
10971097
service:
1098-
description: The name of a service. The service must belong
1099-
to the same namespace as the resource. If the service doesn’t
1100-
exist, NGINX will assume the service has zero endpoints and
1101-
return a 502 response for requests for this upstream. For
1102-
NGINX Plus only, services of type ExternalName are also supported
1103-
.
1098+
description: The name of a service. If the Service belongs to
1099+
a different namespace than the VirtualServer or VirtualServerRoute,
1100+
you need to include the namespace. For example, tea-namespace/tea.
1101+
If the service doesn’t exist, NGINX will assume the service
1102+
has zero endpoints and return a 502 response for requests
1103+
for this upstream. For NGINX Plus only, services of type ExternalName
1104+
are also supported in the same namespace.
11041105
type: string
11051106
sessionCookie:
11061107
description: The SessionCookie field configures session persistence

config/crd/bases/k8s.nginx.org_virtualservers.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,12 +1284,13 @@ spec:
12841284
ConfigMap key.
12851285
type: string
12861286
service:
1287-
description: The name of a service. The service must belong
1288-
to the same namespace as the resource. If the service doesn’t
1289-
exist, NGINX will assume the service has zero endpoints and
1290-
return a 502 response for requests for this upstream. For
1291-
NGINX Plus only, services of type ExternalName are also supported
1292-
.
1287+
description: The name of a service. If the Service belongs to
1288+
a different namespace than the VirtualServer or VirtualServerRoute,
1289+
you need to include the namespace. For example, tea-namespace/tea.
1290+
If the service doesn’t exist, NGINX will assume the service
1291+
has zero endpoints and return a 502 response for requests
1292+
for this upstream. For NGINX Plus only, services of type ExternalName
1293+
are also supported in the same namespace.
12931294
type: string
12941295
sessionCookie:
12951296
description: The SessionCookie field configures session persistence

deploy/crds.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,12 +2133,13 @@ spec:
21332133
ConfigMap key.
21342134
type: string
21352135
service:
2136-
description: The name of a service. The service must belong
2137-
to the same namespace as the resource. If the service doesn’t
2138-
exist, NGINX will assume the service has zero endpoints and
2139-
return a 502 response for requests for this upstream. For
2140-
NGINX Plus only, services of type ExternalName are also supported
2141-
.
2136+
description: The name of a service. If the Service belongs to
2137+
a different namespace than the VirtualServer or VirtualServerRoute,
2138+
you need to include the namespace. For example, tea-namespace/tea.
2139+
If the service doesn’t exist, NGINX will assume the service
2140+
has zero endpoints and return a 502 response for requests
2141+
for this upstream. For NGINX Plus only, services of type ExternalName
2142+
are also supported in the same namespace.
21422143
type: string
21432144
sessionCookie:
21442145
description: The SessionCookie field configures session persistence
@@ -3551,12 +3552,13 @@ spec:
35513552
ConfigMap key.
35523553
type: string
35533554
service:
3554-
description: The name of a service. The service must belong
3555-
to the same namespace as the resource. If the service doesn’t
3556-
exist, NGINX will assume the service has zero endpoints and
3557-
return a 502 response for requests for this upstream. For
3558-
NGINX Plus only, services of type ExternalName are also supported
3559-
.
3555+
description: The name of a service. If the Service belongs to
3556+
a different namespace than the VirtualServer or VirtualServerRoute,
3557+
you need to include the namespace. For example, tea-namespace/tea.
3558+
If the service doesn’t exist, NGINX will assume the service
3559+
has zero endpoints and return a 502 response for requests
3560+
for this upstream. For NGINX Plus only, services of type ExternalName
3561+
are also supported in the same namespace.
35603562
type: string
35613563
sessionCookie:
35623564
description: The SessionCookie field configures session persistence

docs/crd/k8s.nginx.org_virtualserverroutes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ The `.spec` object supports the following fields:
209209
| `upstreams[].queue.timeout` | `string` | The timeout of the queue. A request cannot be queued for a period longer than the timeout. The default is 60s. |
210210
| `upstreams[].read-timeout` | `string` | The timeout for reading a response from an upstream server. The default is specified in the proxy-read-timeout ConfigMap key. |
211211
| `upstreams[].send-timeout` | `string` | The timeout for transmitting a request to an upstream server. The default is specified in the proxy-send-timeout ConfigMap key. |
212-
| `upstreams[].service` | `string` | The name of a service. The service must belong to the same namespace as the resource. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported . |
212+
| `upstreams[].service` | `string` | The name of a service. If the Service belongs to a different namespace than the VirtualServer or VirtualServerRoute, you need to include the namespace. For example, tea-namespace/tea. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported in the same namespace. |
213213
| `upstreams[].sessionCookie` | `object` | The SessionCookie field configures session persistence which allows requests from the same client to be passed to the same upstream server. The information about the designated upstream server is passed in a session cookie generated by NGINX Plus. |
214214
| `upstreams[].sessionCookie.domain` | `string` | The domain for which the cookie is set. |
215215
| `upstreams[].sessionCookie.enable` | `boolean` | Enables session persistence with a session cookie for an upstream server. The default is false. |

docs/crd/k8s.nginx.org_virtualservers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ The `.spec` object supports the following fields:
244244
| `upstreams[].queue.timeout` | `string` | The timeout of the queue. A request cannot be queued for a period longer than the timeout. The default is 60s. |
245245
| `upstreams[].read-timeout` | `string` | The timeout for reading a response from an upstream server. The default is specified in the proxy-read-timeout ConfigMap key. |
246246
| `upstreams[].send-timeout` | `string` | The timeout for transmitting a request to an upstream server. The default is specified in the proxy-send-timeout ConfigMap key. |
247-
| `upstreams[].service` | `string` | The name of a service. The service must belong to the same namespace as the resource. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported . |
247+
| `upstreams[].service` | `string` | The name of a service. If the Service belongs to a different namespace than the VirtualServer or VirtualServerRoute, you need to include the namespace. For example, tea-namespace/tea. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported in the same namespace. |
248248
| `upstreams[].sessionCookie` | `object` | The SessionCookie field configures session persistence which allows requests from the same client to be passed to the same upstream server. The information about the designated upstream server is passed in a session cookie generated by NGINX Plus. |
249249
| `upstreams[].sessionCookie.domain` | `string` | The domain for which the cookie is set. |
250250
| `upstreams[].sessionCookie.enable` | `boolean` | Enables session persistence with a session cookie for an upstream server. The default is false. |

pkg/apis/configuration/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ type PolicyReference struct {
119119
type Upstream struct {
120120
// The name of the upstream. Must be a valid DNS label as defined in RFC 1035. For example, hello and upstream-123 are valid. The name must be unique among all upstreams of the resource.
121121
Name string `json:"name"`
122-
// The name of a service. The service must belong to the same namespace as the resource. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported .
122+
// The name of a service. If the Service belongs to a different namespace than the VirtualServer or VirtualServerRoute, you need to include the namespace. For example, tea-namespace/tea. If the service doesn’t exist, NGINX will assume the service has zero endpoints and return a 502 response for requests for this upstream. For NGINX Plus only, services of type ExternalName are also supported in the same namespace.
123123
Service string `json:"service"`
124124
// Selects the pods within the service using label keys and values. By default, all pods of the service are selected. Note: the specified labels are expected to be present in the pods when they are created. If the pod labels are updated, NGINX Ingress Controller will not see that change until the number of the pods is changed.
125125
Subselector map[string]string `json:"subselector"`

0 commit comments

Comments
 (0)