Skip to content

Commit 288a28b

Browse files
committed
DOC/MINOR: version: make 3.2 latest active version
1 parent 048dc60 commit 288a28b

6 files changed

Lines changed: 20 additions & 28 deletions

File tree

documentation/README.md

Lines changed: 1 addition & 1 deletion
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 3.0
4+
## HAProxy kubernetes ingress controller 3.2
55

66
### Documentation
77

documentation/annotations.md

Lines changed: 3 additions & 9 deletions
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 3.0
4+
## HAProxy kubernetes ingress controller 3.2
55
This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [generator readme](gen/README.md)
66

77
### Custom annotations
@@ -28,7 +28,7 @@ more info about custom annotations can be found in [annotations-custom.md](annot
2828
| [client-ca](#authentication) | string | | ssl-offloading |:large_blue_circle:|:white_circle:|:white_circle:|
2929
| [client-crt-optional](#authentication) | [bool](#bool) | "false" | client-ca |:large_blue_circle:|:white_circle:|:white_circle:|
3030
| [client-strict-sni](#ssl-offloading) | [bool](#bool) | "false" | client-ca |:large_blue_circle:|:white_circle:|:white_circle:|
31-
| [generate-certificates-signer](#ssl-offloading) :construction:(dev) | string | | |:large_blue_circle:|:white_circle:|:white_circle:|
31+
| [generate-certificates-signer](#ssl-offloading) | string | | |:large_blue_circle:|:white_circle:|:white_circle:|
3232
| [cors-enable](#CORS) | [bool](#bool) | "false" | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
3333
| [cors-allow-origin](#CORS) | string | "*" | cors-enable |:large_blue_circle:|:large_blue_circle:|:white_circle:|
3434
| [cors-allow-methods](#CORS) | string | "*" | cors-enable |:large_blue_circle:|:large_blue_circle:|:white_circle:|
@@ -40,7 +40,7 @@ more info about custom annotations can be found in [annotations-custom.md](annot
4040
| [stats-config-snippet](#config-snippet) | string | | |:large_blue_circle:|:white_circle:|:white_circle:|
4141
| [backend-config-snippet](#config-snippet) | string | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
4242
| [cookie-persistence](#cookie-persistence) | string | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
43-
| [cookie-persistence-no-dynamic](#cookie-persistence-no-dynamic) :construction:(dev) | string | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
43+
| [cookie-persistence-no-dynamic](#cookie-persistence-no-dynamic) | string | | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
4444
| [dontlognull](#logging) | [bool](#bool) | "true" | |:large_blue_circle:|:white_circle:|:white_circle:|
4545
| [src-ip-header](#src-ip-header) | string | "null" | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
4646
| [forwarded-for](#x-forwarded-for) | [bool](#bool) | "true" | |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
@@ -712,9 +712,6 @@ cookie-persistence: "mycookie"
712712

713713
##### `cookie-persistence-no-dynamic`
714714

715-
716-
> :construction: this is only available from next version, currently available in dev build
717-
718715
Enables persistent connections (sticky sessions) between a client and a pod by inserting a cookie into the client's browser that is used to remember which backend pod they connected to before.
719716
Dynamic cookies are not used contrary to cookie-persistence annotation. The cookie will have the server name.
720717

@@ -1705,9 +1702,6 @@ client-strict-sni: true
17051702

17061703
##### `generate-certificates-signer`
17071704

1708-
1709-
> :construction: this is only available from next version, currently available in dev build
1710-
17111705
Specifies the Kubernetes kubernetes.io/tls type secret containing the CA certificate file used to sign automatically generated certificates.
17121706
When this annotation is set, HAProxy's generate-certificates feature is automatically enabled on the HTTPS frontend bind line.
17131707
This allows HAProxy to automatically generate certificates for incoming TLS connections using the provided CA for signing.

documentation/controller.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Image can be run with arguments:
4646
| [`--disable-quic`](#--disable-quic) | `false` |
4747
| [`--quic-announce-port`](#--quic-announce-port) | |
4848
| [`--quic-bind-port`](#--quic-bind-port) | |
49-
| [`--disable-writing-only-if-reload`](#--disable-writing-only-if-reload) :construction:(dev) | `false` |
50-
| [`--input-file`](#--input-file) :construction:(dev) | |
51-
| [`--output-file`](#--output-file) :construction:(dev) | |
49+
| [`--disable-writing-only-if-reload`](#--disable-writing-only-if-reload) | `false` |
50+
| [`--input-file`](#--input-file) | |
51+
| [`--output-file`](#--output-file) | |
5252
| [`--disable-ingress-status-update`](#--disable-ingress-status-update) | `false` |
53-
| [`--enable-custom-annotations-on-ingress`](#--enable-custom-annotations-on-ingress) :construction:(dev) | |
53+
| [`--enable-custom-annotations-on-ingress`](#--enable-custom-annotations-on-ingress) | |
5454

5555

5656
### `--configmap`
@@ -824,9 +824,6 @@ args:
824824

825825
### `--disable-writing-only-if-reload`
826826

827-
828-
> :construction: this is only available from next version, currently available in dev build
829-
830827
Disable the delayed writing of files to disk ONLY in case of haproxy reload (= write files to disk even if no reload)
831828

832829
Possible values:
@@ -845,9 +842,6 @@ Example:
845842

846843
### `--input-file`
847844

848-
849-
> :construction: this is only available from next version, currently available in dev build
850-
851845
This is the path to a manifest (yaml) of a v1 version to the CRDs to convert to v3.
852846
Goes with --output-file for the result
853847

@@ -867,9 +861,6 @@ Example:
867861

868862
### `--output-file`
869863

870-
871-
> :construction: this is only available from next version, currently available in dev build
872-
873864
This is the path to a manifest (yaml) where to write to the converted v3 CRD from a v1 manifest (see --input-file).
874865
Goes with --input-file
875866

@@ -909,9 +900,6 @@ Example:
909900

910901
### `--enable-custom-annotations-on-ingress`
911902

912-
913-
> :construction: this is only available from next version, currently available in dev build
914-
915903
Enable support for custom annotations on ingress resources.
916904
Use with caution when using the same annotation on multiple ingresses for same service.
917905

documentation/doc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
active_version: 3.0
1+
active_version: 3.2
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.

documentation/lifecycle.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
| Version | GA | EOL | HAProxy | *k8s versions |
99
| -:|:-:|:-:|:-:|:-:|
10-
| **3.1** | 2025-01 | 2026-02 | 3.1 | 1.32, 1.31, 1.30 |
10+
| **3.2** | 2025-12 | 2027-01 | 3.2 | 1.34, 1.33, 1.32 |
11+
| **3.1** | 2025-01 | 2026-02 | 3.1 | 1.34, 1.33, 1.32, 1.31, 1.30 |
1112
| **3.0** | 2024-06 | 2025-06 | 3.0 | 1.30, 1.29, 1.28 |
1213
| **1.11** | 2024-02 | 2025-02 | 2.8 | 1.28, 1.27, 1.26 |
1314
| **1.10** | 2023-04 | 2024-06 | 2.7 | 1.27, 1.26, 1.25 |

documentation/lifecycle.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
versions:
2+
- version: "3.2"
3+
ga: 2025-12
4+
min_eol: 2027-01
5+
k8s:
6+
- "1.34"
7+
- "1.33"
8+
- "1.32"
29
- version: "3.1"
310
ga: 2025-01
411
min_eol: 2026-02
512
k8s:
13+
- "1.34"
14+
- "1.33"
615
- "1.32"
716
- "1.31"
817
- "1.30"

0 commit comments

Comments
 (0)