Choose the right architecture in bin/linkerd script - #4867
Merged
Conversation
Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
Contributor
Author
|
Created #4868 for the continued issue. |
Contributor
Author
|
@alpeb So This at least fixes that, it's just that it will remain broken for developers who are on Linux but not |
Merged
alpeb
approved these changes
Aug 13, 2020
cpretzer
approved these changes
Aug 13, 2020
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation
I noticed after a local build of linkerd,
bin/linkerd versionwas printing adifferent git version than I expected.
I realized
bin/linkerd(on Linux) was still pointing to./target/cli/linux/linkerdeven though we now build and put images into./target/cli/linux-amd64/linkerd.Solution
We now select the correct architecture directory based off
uname -m.Continued issues
If a binary does not exist in the path returned by
bin/linkerd, we attempt tobuild it with
bin/build-cli-bin. I don't think this script is up to date withmulti-arch builds.
For example if I was on
arm64, I don't thinkbuild-cli-binwould properlybuild a put a binary in
./target/cli/linux-amd64/.Signed-off-by: Kevin Leimkuhler kevin@kleimkuhler.com