Merge pull request #16478 from mfojtik/generated-clients-cli-3

Automatic merge from submit-queue (batch tested with PRs 16452, 16478, 16457) cli: switch to generated clients (part 1)
openshift · Sep 22, 2017 · 5350bad · 5350bad
2 parents 3bd0122 + cb773a4
commit 5350bad
Show file tree

Hide file tree

Showing 30 changed files with 257 additions and 238 deletions.
diff --git a/pkg/apps/apiserver/apiserver.go b/pkg/apps/apiserver/apiserver.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -81,7 +80,8 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 		return nil, err
 	}
 
-	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(appsapiv1.GroupName, c.Registry, c.Scheme, metav1.ParameterCodec, c.Codecs)
+	parameterCodec := runtime.NewParameterCodec(c.Scheme)
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(appsapiv1.GroupName, c.Registry, c.Scheme, parameterCodec, c.Codecs)
 	apiGroupInfo.GroupMeta.GroupVersion = appsapiv1.SchemeGroupVersion
 	apiGroupInfo.VersionedResourcesStorageMap[appsapiv1.SchemeGroupVersion.Version] = v1Storage
 	if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {

diff --git a/pkg/apps/client/internalversion/logs.go b/pkg/apps/client/internalversion/logs.go
@@ -0,0 +1,31 @@
+package internalversion
+
+import (
+	rest "k8s.io/client-go/rest"
+	kapi "k8s.io/kubernetes/pkg/api"
+
+	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
+)
+
+type RolloutLogInterface interface {
+	Logs(name string, options appsapi.DeploymentLogOptions) *rest.Request
+}
+
+func NewRolloutLogClient(c rest.Interface, ns string) RolloutLogInterface {
+	return &rolloutLogs{client: c, ns: ns}
+}
+
+type rolloutLogs struct {
+	client rest.Interface
+	ns     string
+}
+
+func (c *rolloutLogs) Logs(name string, options appsapi.DeploymentLogOptions) *rest.Request {
+	return c.client.
+		Get().
+		Namespace(c.ns).
+		Resource("deploymentConfigs").
+		Name(name).
+		SubResource("log").
+		VersionedParams(&options, kapi.ParameterCodec)
+}
diff --git a/pkg/build/apiserver/apiserver.go b/pkg/build/apiserver/apiserver.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/registry/rest"
@@ -85,7 +84,8 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 		return nil, err
 	}
 
-	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(buildapiv1.GroupName, c.Registry, c.Scheme, metav1.ParameterCodec, c.Codecs)
+	parameterCodec := runtime.NewParameterCodec(c.Scheme)
+	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(buildapiv1.GroupName, c.Registry, c.Scheme, parameterCodec, c.Codecs)
 	apiGroupInfo.GroupMeta.GroupVersion = buildapiv1.SchemeGroupVersion
 	apiGroupInfo.VersionedResourcesStorageMap[buildapiv1.SchemeGroupVersion.Version] = v1Storage
 	if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {

diff --git a/pkg/cmd/server/origin/master.go b/pkg/cmd/server/origin/master.go
@@ -339,9 +339,8 @@ func (c *MasterConfig) withOAuthRedirection(handler, oauthServerHandler http.Han
 
 // RouteAllocator returns a route allocation controller.
 func (c *MasterConfig) RouteAllocator() *routeallocationcontroller.RouteAllocationController {
-	osclient, kclient := c.RouteAllocatorClients()
+	_, kclient := c.RouteAllocatorClients()
 	factory := routeallocationcontroller.RouteAllocationControllerFactory{
-		OSClient:   osclient,
 		KubeClient: kclient,
 	}
 

diff --git a/pkg/oc/cli/cmd/create/clusterquota.go b/pkg/oc/cli/cmd/create/clusterquota.go
@@ -16,9 +16,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	quotaapi "github.com/openshift/origin/pkg/quota/apis/quota"
+	quotaclient "github.com/openshift/origin/pkg/quota/generated/internalclientset/typed/quota/internalversion"
 )
 
 const ClusterQuotaRecommendedName = "clusterresourcequota"
@@ -36,7 +36,7 @@ var (
 
 type CreateClusterQuotaOptions struct {
 	ClusterQuota *quotaapi.ClusterResourceQuota
-	Client       client.ClusterResourceQuotasInterface
+	Client       quotaclient.ClusterResourceQuotasGetter
 
 	DryRun bool
 
@@ -117,11 +117,11 @@ func (o *CreateClusterQuotaOptions) Complete(cmd *cobra.Command, f *clientcmd.Fa
 		}
 		o.ClusterQuota.Spec.Quota.Hard[kapi.ResourceName(tokens[0])] = quantity
 	}
-
-	o.Client, _, err = f.Clients()
+	quotaClient, err := f.OpenshiftInternalQuotaClient()
 	if err != nil {
 		return err
 	}
+	o.Client = quotaClient.Quota()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/deploymentconfig.go b/pkg/oc/cli/cmd/create/deploymentconfig.go
@@ -14,7 +14,7 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	"github.com/openshift/origin/pkg/client"
+	appsinternalversion "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
@@ -33,7 +33,7 @@ var (
 
 type CreateDeploymentConfigOptions struct {
 	DC     *deployapi.DeploymentConfig
-	Client client.DeploymentConfigsNamespacer
+	Client appsinternalversion.DeploymentConfigsGetter
 
 	DryRun bool
 
@@ -106,10 +106,11 @@ func (o *CreateDeploymentConfigOptions) Complete(cmd *cobra.Command, f *clientcm
 		return err
 	}
 
-	o.Client, _, err = f.Clients()
+	appsClient, err := f.OpenshiftInternalAppsClient()
 	if err != nil {
 		return err
 	}
+	o.Client = appsClient.Apps()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/identity.go b/pkg/oc/cli/cmd/create/identity.go
@@ -12,9 +12,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
+	userclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
 )
 
 const IdentityRecommendedName = "identity"
@@ -39,7 +39,7 @@ type CreateIdentityOptions struct {
 	ProviderName     string
 	ProviderUserName string
 
-	IdentityClient client.IdentityInterface
+	IdentityClient userclient.IdentityInterface
 
 	DryRun bool
 
@@ -87,11 +87,11 @@ func (o *CreateIdentityOptions) Complete(cmd *cobra.Command, f *clientcmd.Factor
 
 	o.DryRun = cmdutil.GetFlagBool(cmd, "dry-run")
 
-	client, _, err := f.Clients()
+	client, err := f.OpenshiftInternalUserClient()
 	if err != nil {
 		return err
 	}
-	o.IdentityClient = client.Identities()
+	o.IdentityClient = client.User().Identities()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/imagestream.go b/pkg/oc/cli/cmd/create/imagestream.go
@@ -12,9 +12,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 )
 
 const ImageStreamRecommendedName = "imagestream"
@@ -39,7 +39,7 @@ var (
 
 type CreateImageStreamOptions struct {
 	IS     *imageapi.ImageStream
-	Client client.ImageStreamsNamespacer
+	Client imageclient.ImageStreamsGetter
 
 	DryRun bool
 
@@ -96,10 +96,11 @@ func (o *CreateImageStreamOptions) Complete(cmd *cobra.Command, f *clientcmd.Fac
 		return err
 	}
 
-	o.Client, _, err = f.Clients()
+	client, err := f.OpenshiftInternalImageClient()
 	if err != nil {
 		return err
 	}
+	o.Client = client.Image()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/imagestreamtag.go b/pkg/oc/cli/cmd/create/imagestreamtag.go
@@ -14,10 +14,10 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	ocmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 )
 
 const ImageStreamTagRecommendedName = "imagestreamtag"
@@ -43,7 +43,7 @@ var (
 
 type CreateImageStreamTagOptions struct {
 	ISTag  *imageapi.ImageStreamTag
-	Client client.ImageStreamTagsNamespacer
+	Client imageclient.ImageStreamTagsGetter
 
 	FromImage   string
 	From        string
@@ -121,10 +121,11 @@ func (o *CreateImageStreamTagOptions) Complete(cmd *cobra.Command, f *clientcmd.
 		return err
 	}
 
-	o.Client, _, err = f.Clients()
+	client, err := f.OpenshiftInternalImageClient()
 	if err != nil {
 		return err
 	}
+	o.Client = client.Image()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/policy_binding.go b/pkg/oc/cli/cmd/create/policy_binding.go
@@ -12,7 +12,7 @@ import (
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
-	"github.com/openshift/origin/pkg/client"
+	authorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/typed/authorization/internalversion"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
@@ -30,7 +30,7 @@ type CreatePolicyBindingOptions struct {
 	BindingNamespace string
 	PolicyNamespace  string
 
-	BindingClient client.PolicyBindingsNamespacer
+	BindingClient authorizationclient.PolicyBindingsGetter
 
 	Mapper       meta.RESTMapper
 	OutputFormat string
@@ -71,16 +71,20 @@ func (o *CreatePolicyBindingOptions) Complete(cmd *cobra.Command, f *clientcmd.F
 	}
 	o.BindingNamespace = namespace
 
-	client, kclient, err := f.Clients()
+	_, kclient, err := f.Clients()
 	if err != nil {
 		return err
 	}
 
 	if err := clientcmd.LegacyPolicyResourceGate(kclient.Discovery()); err != nil {
 		return err
 	}
+	client, err := f.OpenshiftInternalAuthorizationClient()
+	if err != nil {
+		return err
+	}
 
-	o.BindingClient = client
+	o.BindingClient = client.Authorization()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")

diff --git a/pkg/oc/cli/cmd/create/user.go b/pkg/oc/cli/cmd/create/user.go
@@ -11,9 +11,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
+	userclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
 )
 
 const UserRecommendedName = "user"
@@ -38,7 +38,7 @@ type CreateUserOptions struct {
 	Name     string
 	FullName string
 
-	UserClient client.UserInterface
+	UserClient userclient.UserInterface
 
 	DryRun bool
 
@@ -81,11 +81,12 @@ func (o *CreateUserOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, a
 
 	o.DryRun = cmdutil.GetFlagBool(cmd, "dry-run")
 
-	client, _, err := f.Clients()
+	client, err := f.OpenshiftInternalUserClient()
 	if err != nil {
 		return err
 	}
-	o.UserClient = client.Users()
+
+	o.UserClient = client.User()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")
@@ -126,7 +127,7 @@ func (o *CreateUserOptions) Run() error {
 
 	var err error
 	if !o.DryRun {
-		actualUser, err = o.UserClient.Create(user)
+		actualUser, err = o.UserClient.Users().Create(user)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/oc/cli/cmd/create/user_identity_mapping.go b/pkg/oc/cli/cmd/create/user_identity_mapping.go
@@ -12,9 +12,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
+	userclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
 )
 
 const UserIdentityMappingRecommendedName = "useridentitymapping"
@@ -35,7 +35,7 @@ type CreateUserIdentityMappingOptions struct {
 	User     string
 	Identity string
 
-	UserIdentityMappingClient client.UserIdentityMappingInterface
+	UserIdentityMappingClient userclient.UserIdentityMappingInterface
 
 	DryRun bool
 
@@ -80,11 +80,11 @@ func (o *CreateUserIdentityMappingOptions) Complete(cmd *cobra.Command, f *clien
 
 	o.DryRun = cmdutil.GetFlagBool(cmd, "dry-run")
 
-	client, _, err := f.Clients()
+	client, err := f.OpenshiftInternalUserClient()
 	if err != nil {
 		return err
 	}
-	o.UserIdentityMappingClient = client.UserIdentityMappings()
+	o.UserIdentityMappingClient = client.User().UserIdentityMappings()
 
 	o.Mapper, _ = f.Object()
 	o.OutputFormat = cmdutil.GetFlagString(cmd, "output")