From 13fc60b9a52d746bbf7a05afd1ebde580739223b Mon Sep 17 00:00:00 2001 From: Zlatko Bratkovic Date: Fri, 8 Mar 2024 11:46:13 +0100 Subject: [PATCH] DOC/MAJOR: set latest ingress controller version to v1.11 --- documentation/README.md | 2 +- documentation/annotations.md | 7 ++----- documentation/controller.md | 20 ++++---------------- documentation/doc.yaml | 2 +- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/documentation/README.md b/documentation/README.md index a0f9dca5..4c8c70e2 100644 --- a/documentation/README.md +++ b/documentation/README.md @@ -1,7 +1,7 @@ # ![HAProxy](../assets/images/haproxy-weblogo-210x49.png "HAProxy") -## HAProxy kubernetes ingress controller 1.10 +## HAProxy kubernetes ingress controller 1.11 ### Documentation diff --git a/documentation/annotations.md b/documentation/annotations.md index b8ef458a..1b82971e 100644 --- a/documentation/annotations.md +++ b/documentation/annotations.md @@ -1,7 +1,7 @@ # ![HAProxy](../assets/images/haproxy-weblogo-210x49.png "HAProxy") -## HAProxy kubernetes ingress controller 1.10 +## HAProxy kubernetes ingress controller 1.11 This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [generator readme](gen/README.md) ### Available annotations @@ -52,7 +52,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge | [path-rewrite](#path-rewrite) | string | | |:large_blue_circle:|:large_blue_circle:|:white_circle:| | [pod-maxconn](#maximum-concurrent-backend-connections) | number | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:| | [proxy-protocol](#proxy-protocol) | IPs or CIDRs | | |:large_blue_circle:|:white_circle:|:white_circle:| -| [quic-alt-svc-max-age](#quic-alt-svc-max-age) :construction:(dev) | number | | ssl-certificate |:large_blue_circle:|:white_circle:|:white_circle:| +| [quic-alt-svc-max-age](#quic-alt-svc-max-age) | number | | ssl-certificate |:large_blue_circle:|:white_circle:|:white_circle:| | [rate-limit-period](#rate-limit) | [time](#time) | "1s" | |:large_blue_circle:|:large_blue_circle:|:white_circle:| | [rate-limit-status-code](#rate-limit) | string | "403" | |:large_blue_circle:|:large_blue_circle:|:white_circle:| | [rate-limit-requests](#rate-limit) | number | | |:large_blue_circle:|:large_blue_circle:|:white_circle:| @@ -1179,9 +1179,6 @@ proxy-protocol: "192.168.1.0/24, 192.168.2.100" ##### `quic-alt-svc-max-age` - - > :construction: this is only available from next version, currently available in dev build - Sets the max age in seconds for the alt-svc header as defined by the standard. Available on: `configmap` diff --git a/documentation/controller.md b/documentation/controller.md index 129403ce..badf2960 100644 --- a/documentation/controller.md +++ b/documentation/controller.md @@ -41,10 +41,10 @@ Image can be run with arguments: | [`--runtime-dir`](#--runtime-dir) | `/tmp/haproxy-ingress/run` | | [`--disable-service-external-name`](#--disable-service-external-name) | `false` | | [`--channel-size`](#--channel-size) | `600` | -| [`--disable-config-snippets`](#--disable-config-snippets) :construction:(dev) | | -| [`--disable-quic`](#--disable-quic) :construction:(dev) | `false` | -| [`--quic-announce-port`](#--quic-announce-port) :construction:(dev) | | -| [`--quic-bind-port`](#--quic-bind-port) :construction:(dev) | | +| [`--disable-config-snippets`](#--disable-config-snippets) | | +| [`--disable-quic`](#--disable-quic) | `false` | +| [`--quic-announce-port`](#--quic-announce-port) | | +| [`--quic-bind-port`](#--quic-bind-port) | | ### `--configmap` @@ -726,9 +726,6 @@ Example: ### `--disable-config-snippets` - - > :construction: this is only available from next version, currently available in dev build - Allow to disable one or several of the following config snippets: backend, frontend, global. Possible values: @@ -749,9 +746,6 @@ Example: ### `--disable-quic` - - > :construction: this is only available from next version, currently available in dev build - option to disable the quic binding used by default if a certificate is provided throug ssl-certificate annotation. Please be aware that the quic implementation is activated with the "limited-quic" global option. Please refer to the documentation for details. Possible values: @@ -770,9 +764,6 @@ args: ### `--quic-announce-port` - - > :construction: this is only available from next version, currently available in dev build - adjust the port in the alt-svc header to redirect to the exposed port in case it differs from the quic binding port. Possible values: @@ -791,9 +782,6 @@ args: ### `--quic-bind-port` - - > :construction: this is only available from next version, currently available in dev build - sets the binding port for quic in HTTPS frontend. Possible values: diff --git a/documentation/doc.yaml b/documentation/doc.yaml index 12ea75bd..bd4b4d0e 100644 --- a/documentation/doc.yaml +++ b/documentation/doc.yaml @@ -1,4 +1,4 @@ -active_version: 1.10 +active_version: 1.11 image_arguments: - argument: --configmap description: Sets the ConfigMap object that defines global settings for the ingress controller. An empty ConfigMap is deployed by default and you can see its name by calling kubectl get configmaps. You can either override the default ConfigMap with your own object that uses the same name, or you can set this argument to point to a different ConfigMap. See the ConfigMap Options to learn which values you can store in the ConfigMap.