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

switch to hyperkube and remove renames #17369

Merged
merged 2 commits into from
Nov 21, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Nov 17, 2017

This publishes hyperkube and switches to use it instead of renaming the openshift binary.

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 17, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Nov 17, 2017

wow, that worked better than it had any right to.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Nov 20, 2017

/retest

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
test/cmd/help.sh Outdated
os::cmd::expect_success 'openshift admin'
os::cmd::expect_success 'openshift start kubernetes'
os::cmd::expect_success 'kubernetes'
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add test for hyperkube?

@mfojtik
Copy link
Contributor

mfojtik commented Nov 20, 2017

LGTM

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2017
@@ -421,12 +415,7 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
%doc README.md
%license LICENSE
%{_bindir}/openshift
%{_bindir}/kube-apiserver
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need symlinks here for backwards compatibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we need symlinks here for backwards compatibility?

A symlink wouldn't work. You could create a bash script if you really wanted to. @smarterclayton didn't indicate it was a requirement.

Copy link
Contributor

Choose a reason for hiding this comment

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

/cc @sdodson

Copy link
Member

Choose a reason for hiding this comment

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

We don't have any dependencies on kube commands in the installer. This should be fine.

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2017
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Nov 20, 2017
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@openshift-merge-robot openshift-merge-robot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 21, 2017
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Nov 21, 2017
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 1f270ca into openshift:master Nov 21, 2017
@openshift-ci-robot
Copy link

@deads2k: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_update 57a5bef link /test extended_conformance_install_update
ci/openshift-jenkins/extended_conformance_gce 57a5bef link /test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@smarterclayton
Copy link
Contributor

You're now building hyperkube twice:

++ Building go targets for linux/amd64: images/pod examples/hello-openshift
++ Building go targets for linux/amd64: vendor/k8s.io/kubernetes/cmd/hyperkube pkg/network/sdn-cni-plugin vendor/github.com/containernetworking/cni/plugins/ipam/host-local vendor/github.com/containernetworking/cni/plugins/main/loopback
++ Building go targets for linux/amd64: cmd/openshift cmd/oc cmd/kubefed cmd/template-service-broker vendor/k8s.io/kubernetes/cmd/hyperkube
++ Building go targets for linux/amd64: test/extended/extended.test

Need to remove it from the IMAGE specific targets now that you made it a normal target.

@deads2k
Copy link
Contributor Author

deads2k commented Nov 22, 2017

Need to remove it from the IMAGE specific targets now that you made it a normal target.

Image targets? What have we built?!

@smarterclayton
Copy link
Contributor

smarterclayton commented Nov 22, 2017 via email

@deads2k deads2k deleted the bin-06-hyper branch January 24, 2018 14:37
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants