Skip to content

Commit

Permalink
fix pkg (istio#2823)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

fix versioning in istioctl

istioctl just reports a bunch of "unknown" for its version (and other commands).  This only happens when istioctl is built using upload-istioctl, but that's what the release build uses (at least for now, I've already had a pending PR for awhile that gets rid of this).

I tested locally that without this change i saw the unknowns, and with it I saw some actual version information when I ran "istioctl-linux version".
  • Loading branch information
mattdelco authored and istio-merge-robot committed Jan 25, 2018
1 parent b9aa285 commit 4d198da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pilot/bin/upload-istioctl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ done
[[ "${BIN_DIR}" != '.' ]] && trap cleanup exit

GOBUILD="${ROOT}/../bin/gobuild.sh"
VERSION_PACKAGE=istio.io/istio/pilot/tools/version
VERSION_PACKAGE=istio.io/istio/pkg/version

STATIC=0 GOOS=linux ${GOBUILD} "${BIN_DIR}/istioctl-linux" ${VERSION_PACKAGE} istio.io/istio/pilot/cmd/istioctl

Expand Down

0 comments on commit 4d198da

Please sign in to comment.