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

Collapse back to upstream reconcile command #20177

Merged
merged 3 commits into from
Jul 11, 2018
Merged

Collapse back to upstream reconcile command #20177

merged 3 commits into from
Jul 11, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jul 2, 2018

Reverts the change that depends on internal types (kubectl is quickly moving away from those). This will fail until https://bugzilla.redhat.com/show_bug.cgi?id=1597334 is done.

@sdodson @openshift/sig-master

@openshift-ci-robot openshift-ci-robot added sig/master approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 2, 2018
@deads2k deads2k mentioned this pull request Jul 2, 2018
Merged
17 tasks
soltysh
soltysh approved these changes Jul 3, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2018
@openshift-bot
Copy link
Contributor

/retest

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

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@soltysh
Copy link
Member

soltysh commented Jul 4, 2018

/hold
@deads2k you need to fix the title for the upstream revert b/c it's failing travis

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2018
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2018
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 5, 2018
@deads2k
UPSTREAM: revert: <drop>: make auth reconcile work with backlevel ver…
0e5da13 
…sions until ansible updates

This reverts commit 979704a.
@deads2k
Copy link
Contributor Author

deads2k commented Jul 5, 2018

title fixed

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 5, 2018
@openshift-ci-robot openshift-ci-robot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 5, 2018
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 5, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jul 5, 2018

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Jul 5, 2018

/test cmd

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jul 5, 2018
@openshift-bot
Copy link
Contributor

/retest

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

@soltysh
Copy link
Member

soltysh commented Jul 6, 2018

@deads2k still not quite right for the commit message, you need UPSTREAM: revert: <sha>: <normal upstream format> to pass through it. UPSTREAM: revert: <drop> you have here won't work.

@deads2k
Copy link
Contributor Author

deads2k commented Jul 6, 2018

@deads2k still not quite right for the commit message, you need UPSTREAM: revert: : to pass through it. UPSTREAM: revert: you have here won't work.

I'll fix the script. With the fork and the bot, we no longer need that level of specificity.

@openshift-bot
Copy link
Contributor

/retest

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

tnozicka
tnozicka reviewed Jul 9, 2018
View reviewed changes
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/registry/rbac/reconciliation"
"fmt"
Copy link
Contributor

@tnozicka tnozicka Jul 9, 2018 •
edited

Choose a reason for hiding this comment

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

nit: reorder to the top with "errors" (forgot this is already wrong in upstream)

@openshift-bot
Copy link
Contributor

/test cross

@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, soltysh

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

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2018
@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 11, 2018
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2018
@openshift-merge-robot openshift-merge-robot merged commit dab335c into openshift:master Jul 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tnozicka tnozicka tnozicka left review comments

@soltysh soltysh soltysh approved these changes

@ironcladlou ironcladlou Awaiting requested review from ironcladlou

@squeed squeed Awaiting requested review from squeed

Assignees

@soltysh soltysh

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. sig/master size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@deads2k @openshift-bot @soltysh @openshift-ci-robot @tnozicka @openshift-merge-robot