Report correct target system architecture in Cilium version #13153
Conversation
This file contains hidden or 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
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
When cross-building Cilium, like we do for the ARM64 image, version.Version reports the GOOS/GOARCH of the build system (i.e. linux/amd64) because it is set to the value of `go version` as run on the build system. Instead, report the Go version properties of the proper target system by using the corresponding information from Go's runtime package. Mimic the `go version` format to keep Cilium's version format backwards-compatible. Fixes #13122 Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
dc5ab32 to
fdebde6
Compare
|
test-me-please |
vadorovsky
approved these changes
Sep 11, 2020
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.
The first commit removes the unused
GOLANGVERSIONmake variable.The second commit fixes Cilium to report
GOOS/GOARCHof the target, not the build system. Quoting its commit message:When cross-building Cilium, like we do for the ARM64 image,
version.Version reports the
GOOS/GOARCHof the build system (i.e.linux/amd64) because it is set to the value ofgo versionas run onthe build system.
Instead, report the Go version properties of the proper target system by
using the corresponding information from Go's
runtimepackage. Mimic thego versionformat to keep Cilium's version format backwards-compatible.Fixes #13122
Marking for backport to 1.8 since this is the first Cilium version that we support ARM64.