Merge pull request #29628 from dims/fix-kubectl-version-extract

Automatic merge from submit-queue

kubectl container - Extract version better

1. Use --client since -c is deprecated now
2. The command (./kubectl version --client | grep -o 'GitVersion:"[^"]*"')
   now returns:
      GitVersion:"v1.4.0-alpha.1.784+ed3a29bd6aeb98-dirty"
   so parse out the version better using sed

Related to #23708
This commit is contained in:
k8s-merge-robot 2016-07-27 21:07:14 -07:00 committed by GitHub
commit fe66c5c5fa

View File

@ -27,7 +27,7 @@ kubectl:
cp ../../_output/local/bin/$(GOOS)/$(GOARCH)/kubectl .
.tag: kubectl
./kubectl version -c | grep -o 'GitVersion:"[^"]*"' | cut -f 2 -d '"' > .tag
./kubectl version --client | grep -o 'GitVersion:"[^"]*"' | sed 's/[^"]*"\([^"+]*\).*/\1/' > .tag
tag: .tag
@echo "Suggest using TAG=$(shell cat .tag)"