Fix haproxy image build #3350
Fix haproxy image build #3350
Conversation
Inherited from: - kubernetes/release#3235 - kubernetes/release#3237 As well as bumping the haproxy version. Tested via: ``` docker buildx build --platform=linux/amd64,linux/arm64 --progress=auto -t gcr.io/k8s-staging-kind/haproxy:v20230905-7dc7aad7 --pull --build-arg GO_VERSION=1.20.4 . ``` Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: saschagrunert The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
size/M
| @@ -28,7 +28,7 @@ RUN [ ! -f /usr/share/copyrights.tar.gz ] || tar -C / -xzvf /usr/share/copyright | |||
| # - bash (ldd is a bash script and debian-base removes bash) | |||
| # - procps (for `kill` which kind needs) | |||
| RUN apt update && \ | |||
| apt install -y --no-install-recommends haproxy=2.2.\* \ | |||
| apt install -y --no-install-recommends haproxy=2.6.\* \ | |||
There was a problem hiding this comment.
I can't remember now why we had to stick on 2.2, I think that there was some behavior change we depended on it
There was a problem hiding this comment.
just switch back to the prevous debian version, we'll revisit later
cc: @BenTheElder
There was a problem hiding this comment.
Doing that in #3351
| @@ -41,19 +41,30 @@ package_to_copyright() { | |||
| # stage_file stages the filepath $1 to $2, following symlinks | |||
| # and staging copyrights | |||
| stage_file() { | |||
| cp -a --parents "${1}" "${2}" | |||
| # /lib is a symlink to /usr/lib in debian 12, means we just stick to | |||
There was a problem hiding this comment.
this seems the problem we have in images/local-path-helper
There was a problem hiding this comment.
we don't need to modify this file, we need to fix images/local-path-helper
|
/assign @aojea @BenTheElder |
Inherited from:
grepcommand kubernetes/release#3237As well as bumping the haproxy version.
Tested via:
Follow-up of #3294