Skip to content

make oadm router and registry resiliant to missing client#18546

Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
deads2k:up-07-routerregistry
Feb 13, 2018
Merged

make oadm router and registry resiliant to missing client#18546
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
deads2k:up-07-routerregistry

Conversation

@deads2k
Copy link
Contributor

@deads2k deads2k commented Feb 9, 2018

oc adm router --dry-run -o yaml (and registry) shouldn't require an apiserver connection. This makes it tolerant for cluster up

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2018
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 9, 2018
return fmt.Errorf("can't check for existing docker-registry %q: %v", name, err)
}
if opts.Config.Action.DryRun {
return fmt.Errorf("Docker registry %q service does not exist", name)
Copy link
Contributor

@mfojtik mfojtik Feb 9, 2018

Choose a reason for hiding this comment

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

nit: docker-registry

@mfojtik
Copy link
Contributor

mfojtik commented Feb 9, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2018
@deads2k deads2k force-pushed the up-07-routerregistry branch from 8f8df53 to e1e8acf Compare February 9, 2018 18:34
@deads2k
Copy link
Contributor Author

deads2k commented Feb 9, 2018

Reworked to add a --local since code is relying on contacting the server when doing dry runs.

@mfojtik take another look?

@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 Feb 9, 2018
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2018
@deads2k deads2k force-pushed the up-07-routerregistry branch from 3b12470 to a509e41 Compare February 9, 2018 19:27
@deads2k
Copy link
Contributor Author

deads2k commented Feb 12, 2018

/assign @mfojtik

prereq for cluster up

@mfojtik
Copy link
Contributor

mfojtik commented Feb 13, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 13, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

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

Automatic merge from submit-queue (batch tested with PRs 18437, 18546, 18550, 18579).

@openshift-merge-robot openshift-merge-robot merged commit 92de18b into openshift:master Feb 13, 2018
@deads2k deads2k deleted the up-07-routerregistry branch July 3, 2018 17:45
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants