Merge pull request #20900 from openshift-cherrypick-robot/cherry-pick-20890-to-release-3.11

eparis · web-flow · commit f3b1136e695e · 2018-09-12T23:15:19.000-04:00
[release-3.11] hack: add kubectl to release tars and zip
diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
@@ -76,16 +76,19 @@ readonly OC_BINARY_COPY=(
 )
 readonly OS_BINARY_RELEASE_CLIENT_WINDOWS=(
   oc.exe
+  kubectl.exe
   README.md
   ./LICENSE
 )
 readonly OS_BINARY_RELEASE_CLIENT_MAC=(
   oc
+  kubectl
   README.md
   ./LICENSE
 )
 readonly OS_BINARY_RELEASE_CLIENT_LINUX=(
   ./oc
+  ./kubectl
   ./README.md
   ./LICENSE
 )
diff --git a/origin.spec b/origin.spec
@@ -431,8 +431,11 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
 %dir %{_datadir}/%{name}/macosx/
 %dir %{_datadir}/%{name}/windows/
 %{_datadir}/%{name}/linux/oc
+%{_datadir}/%{name}/linux/kubectl
 %{_datadir}/%{name}/macosx/oc
+%{_datadir}/%{name}/macosx/kubectl
 %{_datadir}/%{name}/windows/oc.exe
+%{_datadir}/%{name}/windows/kubectl.exe
 %{_datadir}/%{name}/linux/oadm
 %{_datadir}/%{name}/macosx/oadm
 %{_datadir}/%{name}/windows/oadm.exe

Original file line number	Diff line number	Diff line change
`@@ -76,16 +76,19 @@ readonly OC_BINARY_COPY=(`
`76`	`76`	`)`
`77`	`77`	`readonly OS_BINARY_RELEASE_CLIENT_WINDOWS=(`
`78`	`78`	`oc.exe`
	`79`	`+ kubectl.exe`
`79`	`80`	`README.md`
`80`	`81`	`./LICENSE`
`81`	`82`	`)`
`82`	`83`	`readonly OS_BINARY_RELEASE_CLIENT_MAC=(`
`83`	`84`	`oc`
	`85`	`+ kubectl`
`84`	`86`	`README.md`
`85`	`87`	`./LICENSE`
`86`	`88`	`)`
`87`	`89`	`readonly OS_BINARY_RELEASE_CLIENT_LINUX=(`
`88`	`90`	`./oc`
	`91`	`+ ./kubectl`
`89`	`92`	`./README.md`
`90`	`93`	`./LICENSE`
`91`	`94`	`)`