Skip to content

Commit 13fc60b

Browse files
committed
DOC/MAJOR: set latest ingress controller version to v1.11
1 parent ab4a947 commit 13fc60b

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

documentation/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# ![HAProxy](../assets/images/haproxy-weblogo-210x49.png "HAProxy")
33

4-
## HAProxy kubernetes ingress controller 1.10
4+
## HAProxy kubernetes ingress controller 1.11
55

66
### Documentation
77

documentation/annotations.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# ![HAProxy](../assets/images/haproxy-weblogo-210x49.png "HAProxy")
33

4-
## HAProxy kubernetes ingress controller 1.10
4+
## HAProxy kubernetes ingress controller 1.11
55
This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [generator readme](gen/README.md)
66

77
### Available annotations
@@ -52,7 +52,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge
5252
| [path-rewrite](#path-rewrite) | string | | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
5353
| [pod-maxconn](#maximum-concurrent-backend-connections) | number | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
5454
| [proxy-protocol](#proxy-protocol) | IPs or CIDRs | | |:large_blue_circle:|:white_circle:|:white_circle:|
55-
| [quic-alt-svc-max-age](#quic-alt-svc-max-age) :construction:(dev) | number | | ssl-certificate |:large_blue_circle:|:white_circle:|:white_circle:|
55+
| [quic-alt-svc-max-age](#quic-alt-svc-max-age) | number | | ssl-certificate |:large_blue_circle:|:white_circle:|:white_circle:|
5656
| [rate-limit-period](#rate-limit) | [time](#time) | "1s" | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
5757
| [rate-limit-status-code](#rate-limit) | string | "403" | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
5858
| [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"
11791179

11801180
##### `quic-alt-svc-max-age`
11811181

1182-
1183-
> :construction: this is only available from next version, currently available in dev build
1184-
11851182
Sets the max age in seconds for the alt-svc header as defined by the standard.
11861183

11871184
Available on: `configmap`

documentation/controller.md

+4-16
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ Image can be run with arguments:
4141
| [`--runtime-dir`](#--runtime-dir) | `/tmp/haproxy-ingress/run` |
4242
| [`--disable-service-external-name`](#--disable-service-external-name) | `false` |
4343
| [`--channel-size`](#--channel-size) | `600` |
44-
| [`--disable-config-snippets`](#--disable-config-snippets) :construction:(dev) | |
45-
| [`--disable-quic`](#--disable-quic) :construction:(dev) | `false` |
46-
| [`--quic-announce-port`](#--quic-announce-port) :construction:(dev) | |
47-
| [`--quic-bind-port`](#--quic-bind-port) :construction:(dev) | |
44+
| [`--disable-config-snippets`](#--disable-config-snippets) | |
45+
| [`--disable-quic`](#--disable-quic) | `false` |
46+
| [`--quic-announce-port`](#--quic-announce-port) | |
47+
| [`--quic-bind-port`](#--quic-bind-port) | |
4848

4949

5050
### `--configmap`
@@ -726,9 +726,6 @@ Example:
726726

727727
### `--disable-config-snippets`
728728

729-
730-
> :construction: this is only available from next version, currently available in dev build
731-
732729
Allow to disable one or several of the following config snippets: backend, frontend, global.
733730

734731
Possible values:
@@ -749,9 +746,6 @@ Example:
749746

750747
### `--disable-quic`
751748

752-
753-
> :construction: this is only available from next version, currently available in dev build
754-
755749
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.
756750

757751
Possible values:
@@ -770,9 +764,6 @@ args:
770764
771765
### `--quic-announce-port`
772766

773-
774-
> :construction: this is only available from next version, currently available in dev build
775-
776767
adjust the port in the alt-svc header to redirect to the exposed port in case it differs from the quic binding port.
777768

778769
Possible values:
@@ -791,9 +782,6 @@ args:
791782

792783
### `--quic-bind-port`
793784

794-
795-
> :construction: this is only available from next version, currently available in dev build
796-
797785
sets the binding port for quic in HTTPS frontend.
798786

799787
Possible values:

documentation/doc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
active_version: 1.10
1+
active_version: 1.11
22
image_arguments:
33
- argument: --configmap
44
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 <code>kubectl get configmaps</code>. 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.

0 commit comments

Comments
 (0)