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.

Sign up for GitHub

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

Jump to bottom

UPSTREAM: <drop>: stop adding federation to hyperkube one release early #17663

Merged
merged 1 commit into from
Dec 8, 2017
Merged

UPSTREAM: <drop>: stop adding federation to hyperkube one release early #17663

merged 1 commit into from
Dec 8, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Dec 7, 2017

We no longer have a direct dependency on federation, so federation deps are being dropped. Since we build hyperkube (out of the vendor dir), this causes a failure. Long term, we should build hyperkube out of a fork of kubernetes, not the vendor tree of openshift. This removes the federation dependency (which is removed in 1.9 anyway) and hopefully we build from the correct repo in 3.9.

/assign bparees

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 7, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Dec 7, 2017
@deads2k deads2k added cherrypick-candidate and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files labels Dec 7, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Dec 7, 2017
@bparees
Copy link
Contributor

bparees commented Dec 7, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2017
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, 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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Dec 7, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

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

@openshift-ci-robot
Copy link

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install 052ca7c link /test extended_conformance_install

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.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 17663, 17661, 17219).

@openshift-merge-robot openshift-merge-robot merged commit b9e631f into openshift:master Dec 8, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Dec 8, 2017

/cherrypick release-3.8

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 8, 2017
Merged
@openshift-cherrypick-robot
Copy link

@deads2k: new pull request created: #17690

In response to this:

/cherrypick release-3.8

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.

@deads2k
Copy link
Contributor Author

deads2k commented Dec 8, 2017

@Kargakis I'm loving this cherrypick bot

openshift-merge-robot added a commit that referenced this pull request Dec 16, 2017
@openshift-merge-robot
Merge pull request #17690 from openshift-cherrypick-robot/cherry-pick…
cc39bcd 
…-17663-to-release-3.8

Automatic merge from submit-queue.

Automated cherry-pick of #17663 on release-3.8

This is an automated cherry-pick of #17663

/assign deads2k
@deads2k deads2k deleted the bparees-01-hyper branch January 24, 2018 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees Awaiting requested review from bparees

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@bparees bparees

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. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@deads2k @bparees @openshift-ci-robot @openshift-merge-robot @openshift-cherrypick-robot