collapse onto upstream version function

Author: deads2k

hack/import-restrictions.json

@@ -615,15 +615,13 @@
 
       "vendor/github.com/coreos/etcd/clientv3",
       "vendor/github.com/coreos/etcd/pkg/transport",
-      "vendor/github.com/coreos/etcd/version",
       "vendor/github.com/ghodss/yaml",
 
       "vendor/k8s.io/kubernetes/pkg/api/legacyscheme",
       "vendor/k8s.io/kubernetes/pkg/controller",
       "vendor/k8s.io/kubernetes/pkg/controller/deployment/util",
       "vendor/k8s.io/kubernetes/pkg/credentialprovider",
       "vendor/k8s.io/kubernetes/pkg/serviceaccount",
-      "vendor/k8s.io/kubernetes/pkg/version",
 
       "vendor/github.com/openshift/library-go/pkg/git"
     ]

pkg/oc/cli/admin/admin.go

@@ -39,7 +39,6 @@ import (
 	"github.com/openshift/origin/pkg/oc/cli/admin/verifyimagesignature"
 	"github.com/openshift/origin/pkg/oc/cli/kubectlwrappers"
 	"github.com/openshift/origin/pkg/oc/cli/options"
-	"github.com/openshift/origin/pkg/oc/cli/version"
 )
 
 var adminLong = ktemplates.LongDesc(`
@@ -149,9 +148,5 @@ func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, streams genericc
 		options.NewCmdOptions(streams),
 	)
 
-	if name == fullName {
-		cmds.AddCommand(version.NewCmdVersion(fullName, f, version.NewVersionOptions(false, streams)))
-	}
-
 	return cmds
 }

pkg/oc/cli/cli.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	kubecmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -60,7 +61,6 @@ import (
 	"github.com/openshift/origin/pkg/oc/cli/startbuild"
 	"github.com/openshift/origin/pkg/oc/cli/status"
 	"github.com/openshift/origin/pkg/oc/cli/tag"
-	"github.com/openshift/origin/pkg/oc/cli/version"
 	"github.com/openshift/origin/pkg/oc/cli/whoami"
 )
 
@@ -241,9 +241,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 	cmds.AddCommand(newExperimentalCommand("ex", name+" ex", f, ioStreams))
 
 	cmds.AddCommand(kubectlwrappers.NewCmdPlugin(fullName, f, ioStreams))
-	if name == fullName {
-		cmds.AddCommand(version.NewCmdVersion(fullName, f, version.NewVersionOptions(true, ioStreams)))
-	}
+	cmds.AddCommand(kcmd.NewCmdVersion(f, ioStreams))
 	cmds.AddCommand(options.NewCmdOptions(ioStreams))
 
 	if cmds.Flag("namespace") != nil {

pkg/oc/cli/shim_kubectl.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	kclientcmd "k8s.io/client-go/tools/clientcmd"
+	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 	kcmdset "k8s.io/kubernetes/pkg/kubectl/cmd/set"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
@@ -11,6 +12,7 @@ import (
 	"github.com/openshift/origin/pkg/api/legacygroupification"
 	"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
 	"github.com/openshift/origin/pkg/oc/util/clientcmd"
+	"github.com/openshift/origin/pkg/version"
 )
 
 func shimKubectlForOc() {
@@ -41,4 +43,5 @@ func shimKubectlForOc() {
 	// update some functions we inject
 	kcmdutil.GeneratorFn = originpolymorphichelpers.NewGeneratorsFn(kcmdutil.GeneratorFn)
 	kcmdutil.DescriberFn = originpolymorphichelpers.NewDescriberFn(kcmdutil.DescriberFn)
+	kcmd.OverrideGetVersionFn = version.Get
 }