Use oc adm instead of oadm which might not exist in various installations.

[adelton]

Fixes #1845.

[vikram-redhat]

@adelton - what version would this apply from? 3.3 onwards?

cc: @adellape

[adelton]

No idea, I worked with master. If backporting to older versions is needed likely needs to be decided by someone else.

[vikram-redhat]

Ok - maybe @smarterclayton and/or @liggitt ? Should we port this from 3.3 onwards?

[adellape]

@vikram-redhat Downloaded atomic-openshift-clients from the 3.3 channels and it does not include oadm. So this should be relevant from 3.3 and on. I just tried cherry-picking this to the enterprise-3.3 to see how it would go, and there are a lot of conflicts. I would probably suggest just doing a s/oadm/oc adm/ on each of the branches individually instead of trying to cherry-pick this everywhere.

[adelton]

I would probably suggest just doing a s/oadm/oc adm/ on each of the branches individually instead of trying to cherry-pick this everywhere.

Please note that not all git grep '\boadm\b' occurences are being replaced by this pull request.

I can likely produce similar pull request(s) for older branch(es) but I'd like to have this pull request commented on in master, to avoid redoing those if something about this proposed commit is not going in after all.

[adelton]

Rebased on master to fix typo introduced by 6863599 -> af1759344677b554e1c4d05b3f7c34ab2fbb68d2.

[adelton]

Rebased on master -> e0f40a9a2b99446450cd073a9679092f341706b8.

[adelton]

Rebased on master -> 0d5936c270798ef17b8598bab1919f8148cb6423.

[adelton]

@mfojtik, could you please reopen #1845 and ideally help with review of this PR?

Note that the change to origin itself was already merged via openshift/origin#15202 so at this point this is about docs catching up.

[mfojtik]

@smarterclayton was there any reason we keeping the oadm ? i guess enough time has passed already that we should switch to oc adm...

/approve

[adelton]

@smarterclayton was there any reason we keeping the oadm ? i guess enough time has passed already that we should switch to oc adm...

Yes, @smarterclayton noted that in http://lists.openshift.redhat.com/openshift-archives/dev/2017-May/msg00013.html.

/approve

Thanks @mfojtik. What else is needed to get this merged / who can merge this?

[adelton]

@smarterclayton, @mfojtik, what else is needed to get this merged / who can merge this?

[adelton]

Rebased on master -> ccd646e.

[php-coder]

PTAL @openshift/team-documentation

[vikram-redhat]

@mburke5678 - PTAL.

[mburke5678]

@adelton Should we remove the or oadm here and leave only oc adm?

Also, should the following line be:
_Use oc --help and oc adm --help to view all available options.

[adelton]

Can we rule out that there might be an environment where oadm is available and oc is not?

Please note that this pull requests only attempts to actually show that there is oc adm way to do things, and prefer that notation. It did not try to convey message that oadm is deprecated as it seemed to become in the mean time.

[mburke5678]

@adelton From what I understand, the oadm is being deprecated in 3.9. Should we take out all oadm references now,since you have gotten so many to this point?

[adelton]

In 3.9, is it deprecated or completely gone? If it's deprecated but still available (at least in some environments), making note about that with the few oadm occurences that are left might give the change better visibility than merely removing them right away.

[adelton]

@mburke5678, I have a question about the branch/* labels that you've just added.

Do they mean that this change will be automagically backported to those branches? Or are manualy patches needed?

Also, in #4785 (comment) @adellape mentioned that the change might be needed in 3.3 as well -- should that be added to the list of labels?