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

move "openshift ex" -> "oc ex" #17486

Conversation

juanvallejo
Copy link
Contributor

@juanvallejo juanvallejo commented Nov 27, 2017

Moves the experimental command group to oc in order to break deps on pkg/oc in packages outside of that subtree. Part of #17309 and #17356

Release-Note: Experimental commands moved from the "openshift" parent to the "oc" parent

cc @deads2k @liggitt

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 27, 2017
@deads2k
Copy link
Contributor

deads2k commented Nov 28, 2017

You need a release note on this.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, 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-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 28, 2017
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 28, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch from 8d455de to 28fea0d Compare November 28, 2017 15:58
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 28, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch 4 times, most recently from 8e8cb26 to b3cf70d Compare November 28, 2017 19:54
@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 28, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch from b3cf70d to 8b71c30 Compare November 28, 2017 21:44
@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 28, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch from 8b71c30 to 508b618 Compare November 28, 2017 21:46
@@ -162,6 +162,7 @@ function os::start::internal::patch_master_config() {
local sudo=${USE_SUDO:+sudo}
cp "${SERVER_CONFIG_DIR}/master/master-config.yaml" "${SERVER_CONFIG_DIR}/master/master-config.orig.yaml"
oc ex config patch "${SERVER_CONFIG_DIR}/master/master-config.orig.yaml" --patch="{\"etcdConfig\": {\"address\": \"${API_HOST}:${ETCD_PORT}\"}}" | \
oc ex config patch - --patch="{\"pluginConfig\": {\"openshift.io/ImagePolicy\": {\"configuration\": {\"apiVersion\": \"v1\", \"executionRules\": [{\"matchImageAnnotations\": [{\"key\": \"images.openshift.io/deny-execution\", \"value\": \"true\"}], \"name\": \"execution-denied\", \"onResources\": [{\"resource\": \"pods\"}, {\"resource\": \"builds\"}], \"reject\": \"true\", \"skipOnResolutionFailure\": \"true\" }], \"kind\": \"ImagePolicyConfig\" }, \"location\": \"\"}}}" | \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@deads2k fixes tests in #17473

Copy link
Contributor

Choose a reason for hiding this comment

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

@deads2k fixes tests in #17473

You can save this commit for that pull. You want to pick up that pull?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@deads2k

You can save this commit for that pull. You want to pick up that pull?

Sure, will start working on the pull now

openshift-merge-robot added a commit that referenced this pull request Nov 29, 2017
…g-oc

Automatic merge from submit-queue.

move pkg/cmd/util/clientcmd -> pkg/oc/cli/util/clientcmd

This patch *partially* solves a few of the items (currently checked) from #17309 
Now that `clientcmd` (which includes printer factory methods) is moved into `pkg/oc`,
the following files outside of `pkg/oc` need to have their dependency on `clientcmd` broken (this will be done in a separate PR):

- [x] pkg/cmd/server/origin/controller/config.go (#17357)
- [x] pkg/cmd/server/admin/create_error_template.go   (#17357)
- [x] pkg/cmd/server/admin/create_bootstrap_project_template.go (#17357)
- [x] pkg/cmd/server/admin/overwrite_bootstrappolicy.go (*this file has been removed by* #17336)
- [x] pkg/cmd/server/admin/create_login_template.go (#17357)
- [x] pkg/cmd/server/admin/create_provider_selection_template.go (#17357)
- [x] **pkg/cmd/infra/router/template.go** (Wanted by: `pkg/cmd/openshift/openshift.go` (no other dependents)) (#17357)
- [x] **pkg/cmd/infra/router/f5.go** (Wanted by: `pkg/cmd/openshift/openshift.go` (no other dependents)) (#17357)
- [x] pkg/cmd/openshift/openshift.go (#17486 and #17482)
- [x] pkg/cmd/dockerregistry/dockerregistry.go (Wanted by: `cmd/dockerregistry/main.go` (depends on `clientcmd.Config`)) (#17357)
- [x] *pkg/diagnostics/networkpod/util/util.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/client/config_contexts.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/client/run_diagnostics_pod.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/pod/auth.go* (Can  be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] *pkg/diagnostics/network/run_pod.go* (Can be addressed by moving `pkg/diagnostics` inside existing `pkg/oc/admin/diagnostics`) #17393
- [x] pkg/ipfailover/keepalived/plugin.go (moved to `pkg/oc/experimental`) (#17357)
- [x] pkg/federation/kubefed/kubefed.go (#17357)
- [x] pkg/dockerregistry/server/client/client.go (#17357)
- [x] pkg/dockerregistry/server/auth_test.go (#17357)

**bold** = depends on `clientcmd.Config` (not sure what to do about this) AND only dependent is `pkg/cmd/openshift/openshift.go`

cc @deads2k @openshift/cli-review @liggitt
@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 29, 2017
@deads2k
Copy link
Contributor

deads2k commented Nov 29, 2017

/lgtm

@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch from 508b618 to 3310e78 Compare November 29, 2017 19:02
@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 29, 2017
@juanvallejo
Copy link
Contributor Author

/retest

@juanvallejo juanvallejo added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2017
@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install

@juanvallejo juanvallejo force-pushed the jvallejo/move-ex-cmds-to-pkg-oc branch from 3310e78 to 7c3a54e Compare November 29, 2017 22:51
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2017
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, juanvallejo, openshift-merge-robot

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

@juanvallejo juanvallejo added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2017
@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-ci-robot
Copy link

openshift-ci-robot commented Nov 30, 2017

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_update 7c3a54e 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.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 019702d into openshift:master Nov 30, 2017
@juanvallejo juanvallejo deleted the jvallejo/move-ex-cmds-to-pkg-oc branch November 30, 2017 16:13
openshift-merge-robot added a commit that referenced this pull request Nov 30, 2017
…eads2k

Automatic merge from submit-queue.

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

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

cc @deads2k @liggitt @mfojtik
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.

7 participants