Skip to content

Commit 8a3ac56

Browse files
committed
MAJOR: haproxy: use HAProxy 3.0
1 parent 7a45dfd commit 8a3ac56

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN mkdir -p /var/run/vars && \
2929
-ldflags "-X github.com/haproxytech/kubernetes-ingress/pkg/version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG)" \
3030
-o fs/haproxy-ingress-controller .
3131

32-
FROM haproxytech/haproxy-alpine:2.8
32+
FROM haproxytech/haproxy-alpine:3.0
3333

3434
ARG TARGETPLATFORM
3535

build/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM haproxytech/haproxy-alpine:2.8
15+
FROM haproxytech/haproxy-alpine:3.0
1616

1717
ARG TARGETPLATFORM
1818

build/Dockerfile.pebble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN mkdir -p /var/run/vars && \
3131
-ldflags "-X github.com/haproxytech/kubernetes-ingress/pkg/version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG)" \
3232
-o fs/haproxy-ingress-controller .
3333

34-
FROM haproxytech/haproxy-alpine:2.8
34+
FROM haproxytech/haproxy-alpine:3.0
3535

3636
ARG TARGETPLATFORM
3737

documentation/custom-resources.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,6 @@ The `ingress.v1.haproxy.org/Global` CRD `version v1` is using client-native v5
5959

6060
An annototation in the CRD is available to specify the version of client-native used: `haproxy.org/client-native`
6161

62-
Ingress Controller is deployed with `haproxy 2.8`.
63-
Note that the following fields of the CRD are `haproxy 2.9` keywords and cannot be used with this version of Ingress Controller, even if defined the `Globals` CRD:
64-
- `runtime_api.quic-socket`
65-
- `tune_options.events_max_events_at_once`
66-
- `tune_options.max_checks_per_thread`
67-
- `tune_options.rcvbuf_backend`
68-
- `tune_options.rcvbuf_frontend`
69-
- `tune_options.sndbuf_backend`
70-
- `tune_options.sndbuf_frontend`
71-
- `tune_options.zlib_memlevel`
72-
- `tune_options.zlib_windowsize`
73-
74-
7562
### Defaults
7663
The Defaults resource is used to configure the HAProxy defaults section by referencing the resouce via the `cr-defaults` annotation in the Ingress Controller ConfigMap.
7764

0 commit comments

Comments
 (0)