Merge pull request #16195 from soltysh/image_clientsets

Automatic merge from submit-queue

Switch pkg/image to use clientsets

@mfojtik @deads2k I hope this handles all of them, including the SAR bits we've talked about yesterday.

Author: openshift-merge-robot

pkg/client/imagestreamimages.go

@@ -31,6 +31,6 @@ func newImageStreamImages(c *Client, namespace string) *imageStreamImages {
 // Get finds the specified image by name of an image repository and id.
 func (c *imageStreamImages) Get(name, id string) (result *imageapi.ImageStreamImage, err error) {
 	result = &imageapi.ImageStreamImage{}
-	err = c.r.Get().Namespace(c.ns).Resource("imageStreamImages").Name(imageapi.MakeImageStreamImageName(name, id)).Do().Into(result)
+	err = c.r.Get().Namespace(c.ns).Resource("imageStreamImages").Name(imageapi.JoinImageStreamImage(name, id)).Do().Into(result)
 	return
 }

pkg/cmd/server/admission/init.go

@@ -11,6 +11,7 @@ import (
 	"github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
 	"github.com/openshift/origin/pkg/project/cache"
 	"github.com/openshift/origin/pkg/quota/controller/clusterquotamapping"
 	quotainformer "github.com/openshift/origin/pkg/quota/generated/informers/internalversion/quota/internalversion"
@@ -21,6 +22,7 @@ import (
 
 type PluginInitializer struct {
 	OpenshiftClient                 client.Interface
+	OpenshiftInternalImageClient    imageclient.Interface
 	OpenshiftInternalTemplateClient templateclient.Interface
 	ProjectCache                    *cache.ProjectCache
 	OriginQuotaRegistry             quota.Registry
@@ -41,6 +43,9 @@ func (i *PluginInitializer) Initialize(plugin admission.Interface) {
 	if wantsDeprecatedOpenshiftClient, ok := plugin.(WantsDeprecatedOpenshiftClient); ok {
 		wantsDeprecatedOpenshiftClient.SetDeprecatedOpenshiftClient(i.OpenshiftClient)
 	}
+	if wantsOpenshiftImageClient, ok := plugin.(WantsOpenshiftInternalImageClient); ok {
+		wantsOpenshiftImageClient.SetOpenshiftInternalImageClient(i.OpenshiftInternalImageClient)
+	}
 	if WantsOpenshiftInternalTemplateClient, ok := plugin.(WantsOpenshiftInternalTemplateClient); ok {
 		WantsOpenshiftInternalTemplateClient.SetOpenShiftInternalTemplateClient(i.OpenshiftInternalTemplateClient)
 	}

pkg/cmd/server/admission/types.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
 	"github.com/openshift/origin/pkg/project/cache"
 	"github.com/openshift/origin/pkg/quota/controller/clusterquotamapping"
 	quotainformer "github.com/openshift/origin/pkg/quota/generated/informers/internalversion/quota/internalversion"
@@ -24,13 +25,20 @@ type WantsDeprecatedOpenshiftClient interface {
 	admission.Validator
 }
 
-// WantDeprecatedOpenshiftClient should be implemented by admission plugins that need
+// WantsOpenshiftInternalTemplateClient should be implemented by admission plugins that need
 // an Openshift internal template client
 type WantsOpenshiftInternalTemplateClient interface {
 	SetOpenShiftInternalTemplateClient(templateclient.Interface)
 	admission.Validator
 }
 
+// WantsOpenshiftInternalImageClient should be implemented by admission plugins that need
+// an Openshift internal image client
+type WantsOpenshiftInternalImageClient interface {
+	SetOpenshiftInternalImageClient(imageclient.Interface)
+	admission.Validator
+}
+
 // WantsProjectCache should be implemented by admission plugins that need a
 // project cache
 type WantsProjectCache interface {

pkg/cmd/server/origin/master_config.go

@@ -81,6 +81,7 @@ import (
 	imagepolicy "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageinformer "github.com/openshift/origin/pkg/image/generated/informers/internalversion"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
 	ingressadmission "github.com/openshift/origin/pkg/ingress/admission"
 	oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
 	projectauth "github.com/openshift/origin/pkg/project/auth"
@@ -201,6 +202,10 @@ func BuildMasterConfig(options configapi.MasterConfig, informers InformerAccess)
 	if err != nil {
 		return nil, err
 	}
+	imageClient, err := imageclient.NewForConfig(privilegedLoopbackClientConfig)
+	if err != nil {
+		return nil, err
+	}
 
 	templateClient, err := templateclient.NewForConfig(privilegedLoopbackClientConfig)
 	if err != nil {
@@ -277,6 +282,7 @@ func BuildMasterConfig(options configapi.MasterConfig, informers InformerAccess)
 		quotaRegistry)
 	openshiftPluginInitializer := &oadmission.PluginInitializer{
 		OpenshiftClient:                 privilegedLoopbackOpenShiftClient,
+		OpenshiftInternalImageClient:    imageClient,
 		OpenshiftInternalTemplateClient: templateClient,
 		ProjectCache:                    projectCache,
 		OriginQuotaRegistry:             quotaRegistry,

pkg/cmd/util/clientcmd/factory_client_access.go

@@ -36,6 +36,7 @@ import (
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	deploycmd "github.com/openshift/origin/pkg/apps/cmd"
 	"github.com/openshift/origin/pkg/client"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
 	imageutil "github.com/openshift/origin/pkg/image/util"
 	"github.com/openshift/origin/pkg/oc/cli/config"
 	"github.com/openshift/origin/pkg/oc/cli/describe"
@@ -311,15 +312,20 @@ func (f *ring0Factory) ResolveImage(image string) (string, error) {
 	if imageutil.IsDocker(options.Source) {
 		return f.kubeClientAccessFactory.ResolveImage(image)
 	}
-	oc, _, err := f.Clients()
+	config, err := f.OpenShiftClientConfig().ClientConfig()
+	if err != nil {
+		return "", err
+	}
+	imageClient, err := imageclient.NewForConfig(config)
 	if err != nil {
 		return "", err
 	}
 	namespace, _, err := f.DefaultNamespace()
 	if err != nil {
 		return "", err
 	}
-	return imageutil.ResolveImagePullSpec(oc, oc, options.Source, image, namespace)
+
+	return imageutil.ResolveImagePullSpec(imageClient.Image(), options.Source, image, namespace)
 }
 
 func (f *ring0Factory) Resumer(info *resource.Info) ([]byte, error) {

pkg/dockerregistry/server/signaturedispatcher.go

@@ -158,7 +158,7 @@ func (s *signatureHandler) Get(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	image, err := s.isImageClient.ImageStreamImages(s.reference.Namespace).Get(imageapi.MakeImageStreamImageName(s.reference.Name, s.reference.ID), metav1.GetOptions{})
+	image, err := s.isImageClient.ImageStreamImages(s.reference.Namespace).Get(imageapi.JoinImageStreamImage(s.reference.Name, s.reference.ID), metav1.GetOptions{})
 	switch {
 	case err == nil:
 	case kapierrors.IsUnauthorized(err):

pkg/dockerregistry/testutil/fakeopenshift.go

@@ -287,7 +287,7 @@ func (fos *FakeOpenShift) GetImageStreamImage(namespace string, id string) (*ima
 	isi := imageapiv1.ImageStreamImage{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:         namespace,
-			Name:              imageapi.MakeImageStreamImageName(name, imageID),
+			Name:              imageapi.JoinImageStreamImage(name, imageID),
 			CreationTimestamp: image.ObjectMeta.CreationTimestamp,
 			Annotations:       repo.Annotations,
 		},

pkg/image/admission/imagepolicy/imagepolicy.go

@@ -18,13 +18,14 @@ import (
 
 	"github.com/openshift/origin/pkg/api/latest"
 	"github.com/openshift/origin/pkg/api/meta"
-	"github.com/openshift/origin/pkg/client"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 	configlatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
 	"github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
 	"github.com/openshift/origin/pkg/image/admission/imagepolicy/api/validation"
 	"github.com/openshift/origin/pkg/image/admission/imagepolicy/rules"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
+	imageinternalclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 	"github.com/openshift/origin/pkg/project/cache"
 )
 
@@ -53,7 +54,7 @@ func Register(plugins *admission.Plugins) {
 type imagePolicyPlugin struct {
 	*admission.Handler
 	config *api.ImagePolicyConfig
-	client client.Interface
+	client imageinternalclient.ImageInterface
 
 	accepter rules.Accepter
 
@@ -65,7 +66,7 @@ type imagePolicyPlugin struct {
 	resolver     imageResolver
 }
 
-var _ = oadmission.WantsDeprecatedOpenshiftClient(&imagePolicyPlugin{})
+var _ = oadmission.WantsOpenshiftInternalImageClient(&imagePolicyPlugin{})
 var _ = oadmission.WantsDefaultRegistryFunc(&imagePolicyPlugin{})
 
 type integratedRegistryMatcher struct {
@@ -112,8 +113,8 @@ func (a *imagePolicyPlugin) SetDefaultRegistryFunc(fn func() (string, bool)) {
 	a.integratedRegistryMatcher.RegistryMatcher = rules.RegistryNameMatcher(fn)
 }
 
-func (a *imagePolicyPlugin) SetDeprecatedOpenshiftClient(c client.Interface) {
-	a.client = c
+func (a *imagePolicyPlugin) SetOpenshiftInternalImageClient(c imageclient.Interface) {
+	a.client = c.Image()
 }
 
 func (a *imagePolicyPlugin) SetProjectCache(c *cache.ProjectCache) {
@@ -128,7 +129,7 @@ func (a *imagePolicyPlugin) Validate() error {
 	if a.projectCache == nil {
 		return fmt.Errorf("%s needs a project cache", api.PluginName)
 	}
-	imageResolver, err := newImageResolutionCache(a.client.Images(), a.client, a.client, a.client, a.integratedRegistryMatcher)
+	imageResolver, err := newImageResolutionCache(a.client, a.integratedRegistryMatcher)
 	if err != nil {
 		return fmt.Errorf("unable to create image policy controller: %v", err)
 	}
@@ -215,12 +216,9 @@ func (a *imagePolicyPlugin) Admit(attr admission.Attributes) error {
 }
 
 type imageResolutionCache struct {
-	images     client.ImageInterface
-	tags       client.ImageStreamTagsNamespacer
-	streams    client.ImageStreamsNamespacer
-	isImages   client.ImageStreamImagesNamespacer
-	integrated rules.RegistryMatcher
-	expiration time.Duration
+	imageClient imageinternalclient.ImageInterface
+	integrated  rules.RegistryMatcher
+	expiration  time.Duration
 
 	cache *lru.Cache
 }
@@ -231,19 +229,16 @@ type imageCacheEntry struct {
 }
 
 // newImageResolutionCache creates a new resolver that caches frequently loaded images for one minute.
-func newImageResolutionCache(images client.ImageInterface, tags client.ImageStreamTagsNamespacer, streams client.ImageStreamsNamespacer, isImages client.ImageStreamImagesNamespacer, integratedRegistry rules.RegistryMatcher) (*imageResolutionCache, error) {
+func newImageResolutionCache(imageClient imageinternalclient.ImageInterface, integratedRegistry rules.RegistryMatcher) (*imageResolutionCache, error) {
 	imageCache, err := lru.New(128)
 	if err != nil {
 		return nil, err
 	}
 	return &imageResolutionCache{
-		images:     images,
-		tags:       tags,
-		streams:    streams,
-		isImages:   isImages,
-		integrated: integratedRegistry,
-		cache:      imageCache,
-		expiration: time.Minute,
+		imageClient: imageClient,
+		integrated:  integratedRegistry,
+		cache:       imageCache,
+		expiration:  time.Minute,
 	}, nil
 }
 
@@ -299,7 +294,7 @@ func (c *imageResolutionCache) resolveImageReference(ref imageapi.DockerImageRef
 				return &rules.ImagePolicyAttributes{Name: ref, Image: cached.image}, nil
 			}
 		}
-		image, err := c.images.Get(ref.ID, metav1.GetOptions{})
+		image, err := c.imageClient.Images().Get(ref.ID, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
@@ -328,7 +323,7 @@ func (c *imageResolutionCache) resolveImageReference(ref imageapi.DockerImageRef
 // or returns an error.
 func (c *imageResolutionCache) resolveImageStreamTag(namespace, name, tag string, partial, forceResolveLocalNames bool) (*rules.ImagePolicyAttributes, error) {
 	attrs := &rules.ImagePolicyAttributes{IntegratedRegistry: true}
-	resolved, err := c.tags.ImageStreamTags(namespace).Get(name, tag)
+	resolved, err := c.imageClient.ImageStreamTags(namespace).Get(imageapi.JoinImageStreamTag(name, tag), metav1.GetOptions{})
 	if err != nil {
 		if partial {
 			attrs.IntegratedRegistry = false
@@ -337,7 +332,7 @@ func (c *imageResolutionCache) resolveImageStreamTag(namespace, name, tag string
 		// to the internal registry. This prevents the lookup from going to the original location, which is consistent
 		// with the intent of resolving local names.
 		if isImageStreamTagNotFound(err) {
-			if stream, err := c.streams.ImageStreams(namespace).Get(name, metav1.GetOptions{}); err == nil && (forceResolveLocalNames || stream.Spec.LookupPolicy.Local) && len(stream.Status.DockerImageRepository) > 0 {
+			if stream, err := c.imageClient.ImageStreams(namespace).Get(name, metav1.GetOptions{}); err == nil && (forceResolveLocalNames || stream.Spec.LookupPolicy.Local) && len(stream.Status.DockerImageRepository) > 0 {
 				if ref, err := imageapi.ParseDockerImageReference(stream.Status.DockerImageRepository); err == nil {
 					glog.V(4).Infof("%s/%s:%s points to a local name resolving stream, but the tag does not exist", namespace, name, tag)
 					ref.Tag = tag
@@ -374,7 +369,7 @@ func (c *imageResolutionCache) resolveImageStreamTag(namespace, name, tag string
 // resolveImageStreamImage loads an image stream image if it exists, or returns an error.
 func (c *imageResolutionCache) resolveImageStreamImage(namespace, name, id string) (*rules.ImagePolicyAttributes, error) {
 	attrs := &rules.ImagePolicyAttributes{IntegratedRegistry: true}
-	resolved, err := c.isImages.ImageStreamImages(namespace).Get(name, id)
+	resolved, err := c.imageClient.ImageStreamImages(namespace).Get(imageapi.JoinImageStreamImage(name, id), metav1.GetOptions{})
 	if err != nil {
 		return attrs, err
 	}