Externalize admin commands depending on graph library

Author: soltysh

pkg/oc/cli/admin/buildchain/buildchain.go

@@ -15,16 +15,13 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 
 	"github.com/openshift/api/image"
-	buildclientinternal "github.com/openshift/origin/pkg/build/generated/internalclientset"
-	buildclient "github.com/openshift/origin/pkg/build/generated/internalclientset/typed/build/internalversion"
+	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
+	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
 	osutil "github.com/openshift/origin/pkg/cmd/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
-	imageclientinternal "github.com/openshift/origin/pkg/image/generated/internalclientset"
-	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 	"github.com/openshift/origin/pkg/oc/lib/describe"
 	imagegraph "github.com/openshift/origin/pkg/oc/lib/graph/imagegraph/nodes"
-	projectclientinternal "github.com/openshift/origin/pkg/project/generated/internalclientset"
-	projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
 )
 
 // BuildChainRecommendedCommandName is the recommended command name
@@ -61,9 +58,9 @@ type BuildChainOptions struct {
 
 	output string
 
-	buildClient   buildclient.BuildConfigsGetter
-	imageClient   imageclient.ImageStreamTagsGetter
-	projectClient projectclient.ProjectsGetter
+	buildClient   buildv1client.BuildV1Interface
+	imageClient   imagev1client.ImageV1Interface
+	projectClient projectv1client.ProjectV1Interface
 }
 
 // NewCmdBuildChain implements the OpenShift experimental build-chain command
@@ -100,21 +97,18 @@ func (o *BuildChainOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, arg
 	if err != nil {
 		return err
 	}
-	buildClient, err := buildclientinternal.NewForConfig(clientConfig)
+	o.buildClient, err = buildv1client.NewForConfig(clientConfig)
 	if err != nil {
 		return err
 	}
-	imageClient, err := imageclientinternal.NewForConfig(clientConfig)
+	o.imageClient, err = imagev1client.NewForConfig(clientConfig)
 	if err != nil {
 		return err
 	}
-	projectClient, err := projectclientinternal.NewForConfig(clientConfig)
+	o.projectClient, err = projectv1client.NewForConfig(clientConfig)
 	if err != nil {
 		return err
 	}
-	o.buildClient = buildClient.Build()
-	o.imageClient = imageClient.Image()
-	o.projectClient = projectClient.Project()
 
 	resource := schema.GroupResource{}
 	mapper, err := f.ToRESTMapper()
@@ -147,14 +141,12 @@ func (o *BuildChainOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, arg
 		}
 	}
 
-	namespace, _, err := f.ToRawKubeConfigLoader().Namespace()
+	o.defaultNamespace, _, err = f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {
 		return err
 	}
-
-	o.defaultNamespace = namespace
 	glog.V(4).Infof("Using %q as the namespace for %q", o.defaultNamespace, o.name)
-	o.namespaces.Insert(namespace)
+	o.namespaces.Insert(o.defaultNamespace)
 	glog.V(4).Infof("Will look for deps in %s", strings.Join(o.namespaces.List(), ","))
 
 	return nil

pkg/oc/cli/admin/prune/imageprune/helper.go

@@ -10,19 +10,20 @@ import (
 	"github.com/docker/distribution/registry/api/errcode"
 	"github.com/golang/glog"
 
+	corev1 "k8s.io/api/core/v1"
 	kmeta "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	kapiref "k8s.io/kubernetes/pkg/api/ref"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
+	ref "k8s.io/client-go/tools/reference"
+	"k8s.io/kubernetes/pkg/kubectl/scheme"
 
+	imagev1 "github.com/openshift/api/image/v1"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	"github.com/openshift/origin/pkg/util/netutils"
 )
 
 // order younger images before older
-type imgByAge []*imageapi.Image
+type imgByAge []*imagev1.Image
 
 func (ba imgByAge) Len() int      { return len(ba) }
 func (ba imgByAge) Swap(i, j int) { ba[i], ba[j] = ba[j], ba[i] }
@@ -31,7 +32,7 @@ func (ba imgByAge) Less(i, j int) bool {
 }
 
 // order younger image stream before older
-type isByAge []imageapi.ImageStream
+type isByAge []imagev1.ImageStream
 
 func (ba isByAge) Len() int      { return len(ba) }
 func (ba isByAge) Swap(i, j int) { ba[i], ba[j] = ba[j], ba[i] }
@@ -41,9 +42,9 @@ func (ba isByAge) Less(i, j int) bool {
 
 // DetermineRegistryHost returns registry host embedded in a pull-spec of the latest unmanaged image or the
 // latest imagestream from the provided lists. If no such pull-spec is found, error is returned.
-func DetermineRegistryHost(images *imageapi.ImageList, imageStreams *imageapi.ImageStreamList) (string, error) {
+func DetermineRegistryHost(images *imagev1.ImageList, imageStreams *imagev1.ImageStreamList) (string, error) {
 	var pullSpec string
-	var managedImages []*imageapi.Image
+	var managedImages []*imagev1.Image
 
 	// 1st try to determine registry url from a pull spec of the youngest managed image
 	for i := range images.Items {
@@ -223,7 +224,7 @@ type ErrBadReference struct {
 	reason     string
 }
 
-func newErrBadReferenceToImage(reference string, obj *kapi.ObjectReference, reason string) error {
+func newErrBadReferenceToImage(reference string, obj *corev1.ObjectReference, reason string) error {
 	kind := "<UnknownType>"
 	namespace := ""
 	name := "<unknown-name>"
@@ -242,7 +243,7 @@ func newErrBadReferenceToImage(reference string, obj *kapi.ObjectReference, reas
 	}
 }
 
-func newErrBadReferenceTo(targetKind, reference string, obj *kapi.ObjectReference, reason string) error {
+func newErrBadReferenceTo(targetKind, reference string, obj *corev1.ObjectReference, reason string) error {
 	return &ErrBadReference{
 		kind:       obj.Kind,
 		namespace:  obj.Namespace,
@@ -282,7 +283,7 @@ func getName(obj runtime.Object) string {
 	return fmt.Sprintf("%s/%s", ns, accessor.GetName())
 }
 
-func getKindName(obj *kapi.ObjectReference) string {
+func getKindName(obj *corev1.ObjectReference) string {
 	if obj == nil {
 		return "unknown object"
 	}
@@ -293,8 +294,8 @@ func getKindName(obj *kapi.ObjectReference) string {
 	return fmt.Sprintf("%s[%s]", obj.Kind, name)
 }
 
-func getRef(obj runtime.Object) *kapi.ObjectReference {
-	ref, err := kapiref.GetReference(legacyscheme.Scheme, obj)
+func getRef(obj runtime.Object) *corev1.ObjectReference {
+	ref, err := ref.GetReference(scheme.Scheme, obj)
 	if err != nil {
 		glog.Errorf("failed to get reference to object %T: %v", obj, err)
 		return nil