[release-1.27] Use go with alpine 3.18 (#3351) #3384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The 3.18 includes a fix for a bug in musl libc when there is a `search .` in /etc/resolv.conf. Fixes: k0sproject#3351 Ref: https://www.openwall.com/lists/musl/2022/08/31/5 Signed-off-by: Natanael Copa <[email protected]>
jnummelin
reviewed
Aug 15, 2023
| @@ -1,6 +1,6 @@ | |||
| alpine_version = 3.17 | |||
| alpine_patch_version = $(alpine_version).4 | |||
| golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version) | |||
| golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.18 | |||
There was a problem hiding this comment.
Why only on build image, why not on the general alpine version on line 1?
There was a problem hiding this comment.
The problem only affects go compiler. We link statically with CGO_ENABLED=1.
We use alpine 3.17 other places and I thought it would be good to be conservative and continue with that for the stable branch.
There was a problem hiding this comment.
Another option to fix this is to explicitly request netgo, like this:
diff --git a/Makefile b/Makefile
index abc282d32..c7c7d9457 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ EMBEDDED_BINS_BUILDMODE ?= docker
TARGET_OS ?= linux
BUILD_UID ?= $(shell id -u)
BUILD_GID ?= $(shell id -g)
-BUILD_GO_FLAGS := -tags osusergo
+BUILD_GO_FLAGS := -tags netgo,osusergo
BUILD_GO_LDFLAGS_EXTRA :=
DEBUG ?= false
4 tasks
twz123
approved these changes
Aug 17, 2023
|
Backporting to release-1.26 for #3912. |
twz123
added
bug
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-1.26
git worktree add -d .worktree/backport-3384-to-release-1.26 origin/release-1.26
cd .worktree/backport-3384-to-release-1.26
git checkout -b backport-3384-to-release-1.26
ancref=$(git merge-base da6987e9a1d3cf3c5f0b0707b479a00837d02972 1217281f787afed3e71abd1f6d554d043c27c453)
git cherry-pick -x $ancref..1217281f787afed3e71abd1f6d554d043c27c453 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #3351
Type of change
How Has This Been Tested?
Checklist: