Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install kubectl along with oc in rpm spec #20918

Merged
merged 1 commit into from
Sep 10, 2018

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Sep 10, 2018

No description provided.

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 10, 2018
origin.spec Outdated
@@ -299,7 +299,7 @@ for cmd in \
openshift-router \
kubectl
do
ln -s oc %{buildroot}%{_bindir}/$cmd
ln -f -s oc %{buildroot}%{_bindir}/$cmd
Copy link
Member

@eparis eparis Sep 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is creating a link in %{_bindir} == /usr/bin

The e-mail complain I see is about this line failing:
%{_datadir}/%{name}/linux/kubectl
where %{_datadir} == /usr/share

What is creating those files in `%{buildroot}%{_datadir} ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to include the right kubectl files back up about lines 278-280?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i believe they are created by make build (line 227), you are right, I have to add them along with 'oc' in 278. Updated.

@mfojtik mfojtik force-pushed the hack-03-fix-symlink branch from f30d1ea to e59af1b Compare September 10, 2018 15:45
@mfojtik mfojtik changed the title force symlink update in origin.spec install kubectl along with oc in rpm spec Sep 10, 2018
@mfojtik mfojtik force-pushed the hack-03-fix-symlink branch from e59af1b to 926262d Compare September 10, 2018 15:47
@eparis
Copy link
Member

eparis commented Sep 10, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eparis, mfojtik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eparis
Copy link
Member

eparis commented Sep 10, 2018

/retest

@openshift-merge-robot openshift-merge-robot merged commit 6db7633 into openshift:master Sep 10, 2018
@mfojtik
Copy link
Contributor Author

mfojtik commented Sep 11, 2018

/cherrypick release-3.11

@openshift-cherrypick-robot

@mfojtik: new pull request created: #20932

In response to this:

/cherrypick release-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants