Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.0 backport] update golang to go1.21.1 #4583

Closed

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 28, 2023

backport of:

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit af05a68)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
We were depending on alpine's package repository to install compose,
but for debian we used compose's GitHub releases. Depending on distro
packages means that we don't know when updates will happen, and versions
may diverge because of that; for example, alpine 3.18 updated to compose
v2;

On alpine 3.17:

    make -f docker.Makefile build-e2e-image
    docker run --rm docker-cli-e2e docker-compose --version
    docker-compose version 1.29.2, build unknown

On alpine 3.18:

    make -f docker.Makefile build-e2e-image
    docker run --rm docker-cli-e2e docker-compose --version
    Docker Compose version v2.17.3

This caused our e2e script to fail, as it made assumptions about the name
format created by compose, which changed from underscores to hyphens in v2;

    Container cliendtoendsuite-engine-1  Running
    Error: No such object: cliendtoendsuite_engine_1

This patch:

- updates the Dockerfile to install compose from the compose-bin image
- adjusts the e2e script for the new naming scheme format
- removes the version field from the compose-files used in e2e, as they
  are no longer used by compose.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 9e424af)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
It's not needed to build these binaries. The Dockerfile.dev image already
has CGO_ENABLED=0 as default in the golang image, so does not need updates.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit f07e7e1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
This may find its way into the official images, but until it does, let's
make sure we don't get unexpected updates of go.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit e9759ce)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit d254cc3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 24.0.7 milestone Sep 28, 2023
@thaJeztah thaJeztah marked this pull request as draft September 28, 2023 18:25
@thaJeztah thaJeztah changed the title [24.0 backport] update golang to go1.21.1 (and related changes) [24.0 backport] update golang to go1.21.1 Sep 29, 2023
@thaJeztah thaJeztah modified the milestones: 24.0.7, 24.0.8 Nov 2, 2023
@thaJeztah thaJeztah modified the milestones: 24.0.8, 24.0.9, 24.0.10 Jan 25, 2024
@thaJeztah
Copy link
Member Author

closing; there's no plans to do more 24.0.x releases

@thaJeztah thaJeztah closed this Jun 8, 2024
@thaJeztah thaJeztah deleted the 24.0_backport_bump_golang_1.21 branch June 8, 2024 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant