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+ed3a29bd-dirty" so parse out the version better using sed Related to #23708

Merge pull request #29628 from dims/fix-kubectl-version-extract
fe66c5c5 · k8s-merge-robot · GitHub · 5427e8aa · ef0581d1 · fe66c5c5
Commit fe66c5c5 authored Jul 27, 2016 by k8s-merge-robot Committed by GitHub Jul 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Makefile examples/kubectl-container/Makefile +1 -1

No files found.
--- a/examples/kubectl-container/Makefile
+++ b/examples/kubectl-container/Makefile
@@ -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)"