Skip to content

Commit

Permalink
MAJOR: haproxy: use HAProxy 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oktalz committed Jun 10, 2024
1 parent 7a45dfd commit 8a3ac56
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN mkdir -p /var/run/vars && \
-ldflags "-X github.com/haproxytech/kubernetes-ingress/pkg/version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG)" \
-o fs/haproxy-ingress-controller .

FROM haproxytech/haproxy-alpine:2.8
FROM haproxytech/haproxy-alpine:3.0

ARG TARGETPLATFORM

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM haproxytech/haproxy-alpine:2.8
FROM haproxytech/haproxy-alpine:3.0

ARG TARGETPLATFORM

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.pebble
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN mkdir -p /var/run/vars && \
-ldflags "-X github.com/haproxytech/kubernetes-ingress/pkg/version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG)" \
-o fs/haproxy-ingress-controller .

FROM haproxytech/haproxy-alpine:2.8
FROM haproxytech/haproxy-alpine:3.0

ARG TARGETPLATFORM

Expand Down
13 changes: 0 additions & 13 deletions documentation/custom-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,6 @@ The `ingress.v1.haproxy.org/Global` CRD `version v1` is using client-native v5

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

Ingress Controller is deployed with `haproxy 2.8`.
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:
- `runtime_api.quic-socket`
- `tune_options.events_max_events_at_once`
- `tune_options.max_checks_per_thread`
- `tune_options.rcvbuf_backend`
- `tune_options.rcvbuf_frontend`
- `tune_options.sndbuf_backend`
- `tune_options.sndbuf_frontend`
- `tune_options.zlib_memlevel`
- `tune_options.zlib_windowsize`


### Defaults
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.

Expand Down

0 comments on commit 8a3ac56

Please sign in to comment.