You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Release 1.10.0
* Apply suggestions from code review
Co-authored-by: Dean Coakley <[email protected]>
* Apply suggestions from code review
Co-authored-by: Michael Pleshakov <[email protected]>
* Updating github master links to v1.10.0
* Updated instructions for upgrading CRDs with helm
* Added warning for kubectl delete command
* Only the specific upgrade docs should contain deletion of policies
* Merging removal of ingressLink doc changes
* Operator docs now refer to 1.9.1 instead of 1.10.0
Co-authored-by: Dean Coakley <[email protected]>
Co-authored-by: Michael Pleshakov <[email protected]>
Co-authored-by: Michael Pleshakov <[email protected]>
Copy file name to clipboardExpand all lines: CHANGELOG.md
+7-1Lines changed: 7 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -52,7 +52,13 @@ UPGRADE:
52
52
* For Helm, use version 0.8.0 of the chart.
53
53
* As a result of [1270](https://github.com/nginxinc/kubernetes-ingress/pull/1270) and [1277](https://github.com/nginxinc/kubernetes-ingress/pull/1277), the Ingress Controller improved validation of Ingress annotations: more annotations are validated and validation errors are reported via events for Ingress resources. Additionally, the default behavior for invalid annotation values was changed: instead of using the default values, the Ingress Controller will reject a resource with an invalid annotation value, which will make clients see `404` responses from NGINX. See this [document](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/#validation) to learn more. Before upgrading, ensure the Ingress resources don't have annotations with invalid values. Otherwise, after the upgrade, the Ingress Controller will reject such resources.
54
54
* In [1232](https://github.com/nginxinc/kubernetes-ingress/pull/1232)`controller.serviceAccount.imagePullSecrets` was removed. Use the new `controller.serviceAccount.imagePullSecretName` instead.
55
-
* The Policy resource was promoted to `v1`. If you used the `alpha1` version, the policies are needed to be recreated with the `v1` version. Note that all policies except for `accessControl` are still in preview. To enable them, run the Ingress Controller with `- -enable-preview-policies` command-line argument (`controller.enablePreviewPolicies` Helm parameter).
55
+
* The Policy resource was promoted to `v1`. If you used the `alpha1` version, the policies are needed to be recreated with the `v1` version. Before upgrading the Ingress Controller, run the following command to remove the `alpha1` policies CRD (that will also remove all existing `alpha1` policies):
56
+
```
57
+
kubectl delete crd policies.k8s.nginx.org
58
+
```
59
+
As part of the upgrade, make sure to create the `v1` policies CRD. See the corresponding instructions for the [manifests](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-manifests/#create-custom-resources) and [Helm](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#upgrading-the-crds) installations.
60
+
61
+
Also note that all policies except for `accessControl` are still in preview. To enable them, run the Ingress Controller with `- -enable-preview-policies` command-line argument (`controller.enablePreviewPolicies` Helm parameter).
56
62
* It is necessary to update secret resources. See the section UPDATING SECRETS below.
Copy file name to clipboardExpand all lines: docs-web/app-protect/configuration.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,12 +1,12 @@
1
1
# Configuration
2
2
This document describes how to configure the NGINX App Protect module
3
-
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/appprotect).
3
+
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/appprotect).
4
4
5
5
## Global Configuration
6
6
7
7
The NGINX Ingress Controller has a set of global configuration parameters that align with those available in the NGINX App Protect module. See [ConfigMap keys](/nginx-ingress-controller/configuration/global-configuration/configmap-resource/#modules) for the complete list. The App Protect parameters use the `app-protect*` prefix.
8
8
9
-
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/appprotect).
9
+
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/appprotect).
Copy file name to clipboardExpand all lines: docs-web/app-protect/installation.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -36,5 +36,5 @@ Take the steps below to set up and deploy the NGINX Ingress Controller and App P
36
36
3. Enable the App Protect module by adding the `enable-app-protect` [cli argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-enable-app-protect) to your Deployment or DaemonSet file.
37
37
4. [Deploy the Ingress Controller](/nginx-ingress-controller/installation/installation-with-manifests/#deploy-the-ingress-controller).
38
38
39
-
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/appprotect).
39
+
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/appprotect).
Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
4
-
*[*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples) show how to use advanced NGINX features in Ingress resources with annotations.
5
-
*[*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
4
+
*[*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples) show how to use advanced NGINX features in Ingress resources with annotations.
5
+
*[*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
Copy file name to clipboardExpand all lines: docs-web/configuration/global-configuration/configmap-resource.md
+11-11Lines changed: 11 additions & 11 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -149,19 +149,19 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
149
149
* - ``resolver-addresses``
150
150
- Sets the value of the `resolver <https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver>`_ addresses. Note: If you use a DNS name (ex., ``kube-dns.kube-system.svc.cluster.local``\ ) as a resolver address, NGINX Plus will resolve it using the system resolver during the start and on every configuration reload. As a consequence, If the name cannot be resolved or the DNS server doesn't respond, NGINX Plus will fail to start or reload. To avoid this, consider using only IP addresses as resolver addresses. Supported in NGINX Plus only.
151
151
- N/A
152
-
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/externalname-services>`_.
152
+
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/externalname-services>`_.
153
153
* - ``resolver-ipv6``
154
154
- Enables IPv6 resolution in the resolver. Supported in NGINX Plus only.
155
155
- ``True``
156
-
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/externalname-services>`_.
156
+
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/externalname-services>`_.
157
157
* - ``resolver-valid``
158
158
- Sets the time NGINX caches the resolved DNS records. Supported in NGINX Plus only.
159
159
- TTL value of a DNS record
160
-
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/externalname-services>`_.
160
+
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/externalname-services>`_.
161
161
* - ``resolver-timeout``
162
162
- Sets the `resolver_timeout <https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver_timeout>`_ for name resolution. Supported in NGINX Plus only.
163
163
- ``30s``
164
-
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/externalname-services>`_.
164
+
- `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/externalname-services>`_.
165
165
* - ``keepalive-timeout``
166
166
- Sets the value of the `keepalive_timeout <https://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout>`_ directive.
167
167
- ``65s``
@@ -204,15 +204,15 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
204
204
-
205
205
* - ``log-format``
206
206
- Sets the custom `log format <https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format>`_ for HTTP and HTTPS traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by ``\n``). In that case, the Ingress Controller will replace every ``\n`` character with a space character. All ``'`` characters must be escaped.
207
-
- See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/master/internal/configs/version1/nginx.tmpl>`_ for the access log.
207
+
- See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.10.0/internal/configs/version1/nginx.tmpl>`_ for the access log.
208
208
- `Custom Log Format <https://github.com/nginxinc/kubernetes-ingress/tree/update-log-format/examples/custom-log-format>`_.
209
209
* - ``log-format-escaping``
210
210
- Sets the characters escaping for the variables of the log format. Supported values: ``json`` (JSON escaping), ``default`` (the default escaping) ``none`` (disables escaping).
211
211
- ``default``
212
212
-
213
213
* - ``stream-log-format``
214
214
- Sets the custom `log format <https://nginx.org/en/docs/stream/ngx_stream_log_module.html#log_format>`_ for TCP, UDP, and TLS Passthrough traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by ``\n``). In that case, the Ingress Controller will replace every ``\n`` character with a space character. All ``'`` characters must be escaped.
215
-
- See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/master/internal/configs/version1/nginx.tmpl>`_.
215
+
- See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.10.0/internal/configs/version1/nginx.tmpl>`_.
216
216
-
217
217
* - ``stream-log-format-escaping``
218
218
- Sets the characters escaping for the variables of the stream log format. Supported values: ``json`` (JSON escaping), ``default`` (the default escaping) ``none`` (disables escaping).
@@ -309,7 +309,7 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
309
309
* - ``proxy-protocol``
310
310
- Enables PROXY Protocol for incoming connections.
@@ -373,7 +373,7 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
373
373
* - ``stream-snippets``
374
374
- Sets a custom snippet in stream context.
375
375
- N/A
376
-
- `Support for TCP/UDP Load Balancing <https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/tcp-udp>`_.
376
+
- `Support for TCP/UDP Load Balancing <https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/tcp-udp>`_.
377
377
* - ``main-template``
378
378
- Sets the main NGINX configuration template.
379
379
- By default the template is read from the file in the container.
@@ -401,15 +401,15 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
401
401
* - ``opentracing``
402
402
- Enables `OpenTracing <https://opentracing.io>`_ globally (for all Ingress, VirtualServer and VirtualServerRoute resources). Note: requires the Ingress Controller image with OpenTracing module and a tracer. See the `docs </nginx-ingress-controller/third-party-modules/opentracing>`_ for more information.
403
403
- ``False``
404
-
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/master/examples/opentracing/README.md>`_.
404
+
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.10.0/examples/opentracing/README.md>`_.
405
405
* - ``opentracing-tracer``
406
406
- Sets the path to the vendor tracer binary plugin.
407
407
- N/A
408
-
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/master/examples/opentracing/README.md>`_.
408
+
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.10.0/examples/opentracing/README.md>`_.
409
409
* - ``opentracing-tracer-config``
410
410
- Sets the tracer configuration in JSON format.
411
411
- N/A
412
-
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/master/examples/opentracing/README.md>`_.
412
+
- `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.10.0/examples/opentracing/README.md>`_.
413
413
* - ``app-protect-cookie-seed``
414
414
- Sets the ``app_protect_cookie_seed`` `global directive </nginx-app-protect/configuration/#global-directives>`_.
The Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples/custom-templates).
3
+
The Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples/custom-templates).
Copy file name to clipboardExpand all lines: docs-web/configuration/handling-host-collisions.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -66,4 +66,4 @@ Similarly, if `cafe-ingress` was created first, it will win `cafe.example.com` a
66
66
67
67
It is possible to merge configuration for multiple Ingress resources for the same host. One common use case for this approach is distributing resources across multiple namespaces. See the [Cross-namespace Configuration](/nginx-ingress-controller/configuration/ingress-resources/cross-namespace-configuration/) doc for more information.
68
68
69
-
It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples-of-custom-resources/cross-namespace-configuration) on GitHub.
69
+
It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.10.0/examples-of-custom-resources/cross-namespace-configuration) on GitHub.
0 commit comments