When splitting oc into it's own repo we have vendored it back into origin to move it out in stages (code, rpms, images, cross arch images) so we limit downtime of the move. We have to make oc repo make authoritative before 4.2.0. To my knowledge RPMs are the last piece I haven't moved yet. (We have the new oc.spec in oc repo an building it there, the issue is to get it into the base image build from origin repo.)
also needs https://jira.coreos.com/browse/ART-844
We are entirely removing oc from origin in: - https://github.com/openshift/origin/pull/23626 - https://github.com/openshift/origin/pull/23567
https://github.com/openshift/origin/pull/23626 still open.
The actual code behind building rpm is out with https://github.com/openshift/origin/pull/23567 in. https://github.com/openshift/origin/pull/23626 is about removing oc code from origin, but that's irrelevant at this point in time. Moving to modified.
Confirmed with latest oc installed from openshift-clients-redistributable-4.2.0-201908291419.git.1.f30753c.el7.x86_64.rpm [root@dhcp-140-138 linux]# ./oc version Client Version: version.Info{Major:"", Minor:"", GitVersion:"v4.2.0", GitCommit:"b30057af7ae85dcec54ef27db44ef59b1a363803", GitTreeState:"clean", BuildDate:"2019-08-29T18:32:27Z", GoVersion:"go1.12.8", Compiler:"gc", Platform:"linux/amd64"} Server Version: version.Info{Major:"1", Minor:"13+", GitVersion:"v1.13.4+b758672", GitCommit:"b758672", GitTreeState:"clean", BuildDate:"2019-08-29T23:00:34Z", GoVersion:"go1.11.13", Compiler:"gc", Platform:"linux/amd64"} OpenShift Version: 4.1.0-0.nightly-2019-08-30-035445 [root@dhcp-140-138 oc]# git log -l f30753c commit b30057af7ae85dcec54ef27db44ef59b1a363803 (HEAD -> release-4.2, tag: openshift-clients-4.2.0-201908291419, origin/release-4.3, origin/release-4.2, origin/master, origin/HEAD)
Maybe comment 7 forgot to clarify it. Yes, b30057a shown from `oc version` indeed is commit of oc repo now. But f30753c shown in rpm name openshift-clients-redistributable-4.2.0-201908291419.git.1.f30753c.el7.x86_64.rpm is confusing. It should be same as `oc version`. Checked f30753c BTW, it is not a commit of oc repo (and not an origin or ose repo commit either). Thus this checkpoint should be fixed. Compare old puddles, the commit shown in `oc version` is same as rpm name (e.g. http://download.eng.bos.redhat.com/rcm-guest/puddles/RHAOS/AtomicOpenShift/4.2/v4.2.0-201909011300_2019-09-01.3/x86_64/os/Packages/openshift-clients-4.2.0-201909011300.git.1.e80e512.el7.x86_64.rpm ) .
I don't think those 2 need to be the same as one is a commit from the source repo and the other one is from the rpm repo. But certainly a different BZ and different team (ART) if you want to pursue it. This BZ is named "oc rpm is building stale code vendored back into origin" and given the oc rpm contains the new code, I'd consider it fixed. Especially given these 2 PRs: - https://github.com/openshift/origin/pull/23567 - https://github.com/openshift/origin/pull/23626 and this $ ll github.com/openshift/origin/vendor/github.com/openshift/oc ls: cannot access 'vendor/github.com/openshift/oc': No such file or directory I don't think that can be the case now.
Thanks
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHBA-2019:2922