Skip to content

Commit

Permalink
Merge pull request #20932 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-20918-to-release-3.11

[release-3.11] install kubectl along with oc in rpm spec
  • Loading branch information
openshift-merge-robot authored Sep 11, 2018
2 parents e021a71 + 55559d8 commit ec68b95
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions origin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,11 @@ install -p -m 755 _output/local/bin/${PLATFORM}/ginkgo %{buildroot}%{_libexecdir
# Install client executable for windows and mac
install -d %{buildroot}%{_datadir}/%{name}/{linux,macosx,windows}
install -p -m 755 _output/local/bin/linux/amd64/oc %{buildroot}%{_datadir}/%{name}/linux/oc
install -p -m 755 _output/local/bin/linux/amd64/kubectl %{buildroot}%{_datadir}/%{name}/linux/kubectl
install -p -m 755 _output/local/bin/darwin/amd64/oc %{buildroot}/%{_datadir}/%{name}/macosx/oc
install -p -m 755 _output/local/bin/darwin/amd64/kubectl %{buildroot}/%{_datadir}/%{name}/macosx/kubectl
install -p -m 755 _output/local/bin/windows/amd64/oc.exe %{buildroot}/%{_datadir}/%{name}/windows/oc.exe
install -p -m 755 _output/local/bin/windows/amd64/kubectl.exe %{buildroot}/%{_datadir}/%{name}/windows/kubectl.exe
# Install oadm client executable
install -p -m 755 _output/local/bin/linux/amd64/oadm %{buildroot}%{_datadir}/%{name}/linux/oadm
install -p -m 755 _output/local/bin/darwin/amd64/oadm %{buildroot}/%{_datadir}/%{name}/macosx/oadm
Expand Down

0 comments on commit ec68b95

Please sign in to comment.