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

accept --kubeconfig like kubectl #20721

Merged
merged 3 commits into from
Aug 23, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Aug 21, 2018

One of the final remaining oc/kubectl inconsistencies is --kubeconfig. We take --config instead, but that collides in commands taking config in weird ways. This updates oc to accept either for the time being.

@openshift/cli-review
I doubt we get to drop --config support anytime soon, but this gives us compatibility and we could write a decent plugin after this
@smarterclayton I think this is the last big one
/assign @soltysh

@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 Aug 21, 2018
Copy link
Contributor

@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.

One nit and you're good to go.

@@ -106,12 +106,13 @@ os::cmd::expect_success 'oc get projects'
os::cmd::expect_success 'oc project project-foo'
os::cmd::expect_success_and_text 'oc config view' "current-context.+project-foo/${API_HOST}:${API_PORT}/test-user"
os::cmd::expect_success_and_text 'oc whoami' 'test-user'
os::cmd::expect_success_and_text "oc whoami --config='${login_kubeconfig}'" 'system:admin'
os::cmd::expect_success_and_text "oc whoami --kubeconfig='${login_kubeconfig}'" 'system:admin'
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you wanted one to be --config to verify it still works, right?

@deads2k deads2k force-pushed the cli-02-kubeconfig branch from 16a6227 to 8045bb4 Compare August 22, 2018 14:24
@deads2k
Copy link
Contributor Author

deads2k commented Aug 22, 2018

updated.

@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 22, 2018
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2018
@deads2k deads2k force-pushed the cli-02-kubeconfig branch from 8045bb4 to f20c0a4 Compare August 22, 2018 15:34
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Aug 22, 2018

/retest

1 similar comment
@deads2k
Copy link
Contributor Author

deads2k commented Aug 22, 2018

/retest

@smarterclayton
Copy link
Contributor

smarterclayton commented Aug 23, 2018 via email

Copy link
Contributor

@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 Aug 23, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, smarterclayton, 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

@openshift-merge-robot openshift-merge-robot merged commit 3f04e0b into openshift:master Aug 23, 2018
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants