linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent kind-load from resolving TAG when images are provided (#4634) 

* Update the logic for resolving the tag based on script parameters
Signed-off-by: Charles Pretzer <charles@buoyant.io>
This commit is contained in:
cpretzer 2020-06-19 11:29:50 -07:00 committed by GitHub
parent 82e91382b7
commit 84a29b9612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/kind-load
View File

@ -58,12 +58,13 @@ cluster=${1:-"kind"}
bindir=$( cd "${0%/*}" && pwd )
# shellcheck source=_tag.sh
. "$bindir"/_tag.sh
# shellcheck source=_docker.sh
. "$bindir"/_docker.sh
TAG=${TAG:-$(head_root_tag)}
if [ -z "$images" ] || [ -n "$images_host" ]; then
# shellcheck source=_tag.sh
. "$bindir"/_tag.sh
# shellcheck source=_docker.sh
. "$bindir"/_docker.sh
TAG=${TAG:-$(head_root_tag)}
fi
# This is really to load the kind binary synchronously, before
# the parallel executions below attempt doing so