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

pick pull 17473: stop adding beta admission config to default master configs #17516

Merged
merged 2 commits into from
Nov 30, 2017
Merged

pick pull 17473: stop adding beta admission config to default master configs #17516

merged 2 commits into from
Nov 30, 2017

Conversation

juanvallejo
Copy link
Contributor

@juanvallejo juanvallejo commented Nov 29, 2017 •
edited
Loading

Picks up #17473 per the discussion with @deads2k in #17486 (comment)

cc @deads2k @liggitt @mfojtik

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 29, 2017
@juanvallejo juanvallejo changed the title Jvallejo/pick pull 17473 deads2k pick pull 17473: stop adding beta admission config to default master configs Nov 29, 2017
@juanvallejo juanvallejo mentioned this pull request Nov 29, 2017
Closed
@juanvallejo juanvallejo force-pushed the jvallejo/pick-pull-17473-deads2k branch from da1cca8 to ded8070 Compare November 29, 2017 19:25
@juanvallejo
Copy link
Contributor Author

/test cmd

@juanvallejo juanvallejo force-pushed the jvallejo/pick-pull-17473-deads2k branch from ded8070 to 866dca1 Compare November 29, 2017 21:20
@juanvallejo
Copy link
Contributor Author

/retest

@juanvallejo juanvallejo force-pushed the jvallejo/pick-pull-17473-deads2k branch from aae8639 to baaf568 Compare November 29, 2017 22:47
@juanvallejo
Copy link
Contributor Author

@deads2k approving this PR per your verbal lgtm

@juanvallejo juanvallejo added 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. labels Nov 29, 2017
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: juanvallejo

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@deads2k
Copy link
Contributor

deads2k commented Nov 30, 2017

/retest

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install_update

@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 30, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/pick-pull-17473-deads2k branch from baaf568 to 93ddeae Compare November 30, 2017 17:39
@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 30, 2017
@deads2k deads2k mentioned this pull request Nov 30, 2017
Merged
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2017
@deads2k deads2k mentioned this pull request Nov 30, 2017
Merged
@deads2k
Copy link
Contributor

deads2k commented Nov 30, 2017

/retest

1 similar comment
@deads2k
Copy link
Contributor

deads2k commented Nov 30, 2017

/retest

@juanvallejo
Copy link
Contributor Author

/test crio

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install

@juanvallejo
Copy link
Contributor Author

/test crio

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install

@deads2k
Copy link
Contributor

deads2k commented Nov 30, 2017

@juanvallejo start writing up flake issues for the different e2e issues.

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install_update

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit af153e2 into openshift:master Nov 30, 2017
@openshift-ci-robot
Copy link

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_update 93ddeae link /test extended_conformance_install_update

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.

@juanvallejo juanvallejo deleted the jvallejo/pick-pull-17473-deads2k branch December 1, 2017 14:59
openshift-merge-robot added a commit that referenced this pull request Dec 5, 2017
@openshift-merge-robot
Merge pull request #17536 from deads2k/oc-01-restrict
29bacc4 
Automatic merge from submit-queue (batch tested with PRs 17536, 17512).

 prevent references from origin to oc

Builds on #17516 and #17357

After this, oc can be deleted from origin during the next kube bump.

@juanvallejo missed one.  I hacked it in.  You'll want to pretty it up eventually.
@eparis @smarterclayton after this merges, I think we're good to branch 3.8.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt Awaiting requested review from liggitt

@mrogers950 mrogers950 Awaiting requested review from mrogers950

Assignees
No one assigned
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

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