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

Fix install-pr script (#4610) 

* Fix install-pr script
* Add image-archives path to commands to use the files

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
Signed-off-by: Charles Pretzer <charles@buoyant.io>
Co-authored-by: Charles Pretzer <charles@buoyant.io>
This commit is contained in:
Kevin Leimkuhler 2020-06-18 00:32:01 -04:00 committed by GitHub
parent fe71ef04b0
commit f6bd722e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/install-pr
View File

@ -80,11 +80,11 @@ cd "$dir" || exit
echo "### Downloading images ###" echo "### Downloading images ###"
curl -L -o archive.zip -H "$auth" "$archive" curl -L -o archive.zip -H "$auth" "$archive"
unzip -o archive.zip unzip -o archive.zip -d image-archives/
echo "### Loading images into Docker ###" echo "### Loading images into Docker ###"
image=$(docker load -i cli-bin.tar | sed 's/Loaded image: //') image=$(docker load -i image-archives/cli-bin.tar | sed 's/Loaded image: //')
tag=$(echo "$image" | cut -f 2 -d ":") tag=$(echo "$image" | cut -f 2 -d ":")
if [ $is_kind ] if [ $is_kind ]
@ -99,7 +99,7 @@ then
else else
for image in cni-plugin controller debug grafana proxy web for image in cni-plugin controller debug grafana proxy web
do do
image=$(docker load -i "$image.tar" | sed 's/Loaded image: //') image=$(docker load -i "image-archives/$image.tar" | sed 's/Loaded image: //')
docker push "$image" docker push "$image"
done done
fi fi

2
test/install_test.go
View File

@ -655,7 +655,7 @@ func TestInject(t *testing.T) {
} }
func TestServiceProfileDeploy(t *testing.T) { func TestServiceProfileDeploy(t *testing.T) {
bbProto, err := TestHelper.HTTPGetURL("https://raw.githubusercontent.com/BuoyantIO/bb/55b78f210c98a7eb431c3f555cf0a406f0b12edf/api.proto") bbProto, err := TestHelper.HTTPGetURL("https://raw.githubusercontent.com/BuoyantIO/bb/v0.0.5/api.proto")
if err != nil { if err != nil {
testutil.AnnotatedFatalf(t, "unexpected error", testutil.AnnotatedFatalf(t, "unexpected error",
"unexpected error: %v %s", err, bbProto) "unexpected error: %v %s", err, bbProto)