@@ -12899,6 +12899,8 @@ _oc_set_image()

     local_nonpersistent_flags+=("--show-labels")

     flags+=("--sort-by=")

     local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--source=")

+    local_nonpersistent_flags+=("--source=")

     flags+=("--template=")

     flags_with_completion+=("--template")

     flags_completion+=("_filedir")

@@ -17482,6 +17482,8 @@ _openshift_cli_set_image()

     local_nonpersistent_flags+=("--show-labels")

     flags+=("--sort-by=")

     local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--source=")

+    local_nonpersistent_flags+=("--source=")

     flags+=("--template=")

     flags_with_completion+=("--template")

     flags_completion+=("_filedir")

@@ -13061,6 +13061,8 @@ _oc_set_image()

     local_nonpersistent_flags+=("--show-labels")

     flags+=("--sort-by=")

     local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--source=")

+    local_nonpersistent_flags+=("--source=")

     flags+=("--template=")

     flags_with_completion+=("--template")

     flags_completion+=("_filedir")

@@ -17644,6 +17644,8 @@ _openshift_cli_set_image()

     local_nonpersistent_flags+=("--show-labels")

     flags+=("--sort-by=")

     local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--source=")

+    local_nonpersistent_flags+=("--source=")

     flags+=("--template=")

     flags_with_completion+=("--template")

     flags_completion+=("_filedir")

@@ -69,6 +69,10 @@ Update existing container image(s) of resources.

     If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

 .PP

+\fB\-\-source\fP="istag"

+    The image source type; valid types are valid values are 'imagestreamtag', 'istag', 'imagestreamimage', 'isimage', and 'docker'

+

+.PP

 \fB\-\-template\fP=""

     Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

 \[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

@@ -69,6 +69,10 @@ Update existing container image(s) of resources.

     If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

 .PP

+\fB\-\-source\fP="istag"

+    The image source type; valid types are valid values are 'imagestreamtag', 'istag', 'imagestreamimage', 'isimage', and 'docker'

+

+.PP

 \fB\-\-template\fP=""

     Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

 \[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

@@ -83,5 +83,9 @@ func NewCmdImage(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co

 	cmd := set.NewCmdImage(f.Factory, out)

 	cmd.Long = setImageLong

 	cmd.Example = fmt.Sprintf(setImageExample, fullName)

+

+	flags := cmd.Flags()

+	f.ImageResolutionOptions.Bind(flags)

+

 	return cmd

 }

@@ -53,6 +53,7 @@ import (

 	deploycmd "github.com/openshift/origin/pkg/deploy/cmd"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 	imageapi "github.com/openshift/origin/pkg/image/api"

+	imageutil "github.com/openshift/origin/pkg/image/util"

 	routegen "github.com/openshift/origin/pkg/route/generator"

 	userapi "github.com/openshift/origin/pkg/user/api"

 	authenticationreaper "github.com/openshift/origin/pkg/user/reaper"

@@ -167,6 +168,8 @@ type Factory struct {

 	*cmdutil.Factory

 	OpenShiftClientConfig kclientcmd.ClientConfig

 	clients               *clientCache

+

+	ImageResolutionOptions FlagBinder

 }

 func DefaultGenerators(cmdName string) map[string]kubectl.Generator {

@@ -193,9 +196,10 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 	}

 	w := &Factory{

-		Factory:               cmdutil.NewFactory(clientConfig),

-		OpenShiftClientConfig: clientConfig,

-		clients:               clients,

+		Factory:                cmdutil.NewFactory(clientConfig),

+		OpenShiftClientConfig:  clientConfig,

+		clients:                clients,

+		ImageResolutionOptions: &imageResolutionOptions{},

 	}

 	w.Object = func(bool) (meta.RESTMapper, runtime.ObjectTyper) {

@@ -599,6 +603,22 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 			return kResumeObjectFunc(object)

 		}

 	}

+	kResolveImageFunc := w.Factory.ResolveImage

+	w.Factory.ResolveImage = func(image string) (string, error) {

+		options := w.ImageResolutionOptions.(*imageResolutionOptions)

+		if imageutil.IsDocker(options.Source) {

+			return kResolveImageFunc(image)

+		}

+		oc, _, err := w.Clients()

+		if err != nil {

+			return "", err

+		}

+		namespace, _, err := w.DefaultNamespace()

+		if err != nil {

+			return "", err

+		}

+		return imageutil.ResolveImagePullSpec(oc, oc, options.Source, image, namespace)

+	}

 	kHistoryViewerFunc := w.Factory.HistoryViewer

 	w.Factory.HistoryViewer = func(mapping *meta.RESTMapping) (kubectl.HistoryViewer, error) {

 		switch mapping.GroupVersionKind.GroupKind() {

@@ -627,6 +647,34 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 	return w

 }

+// FlagBinder represents an interface that allows to bind extra flags into commands.

+type FlagBinder interface {

+	// Bound returns true if the flag is already bound to a command.

+	Bound() bool

+	// Bind allows to bind an extra flag to a command

+	Bind(*pflag.FlagSet)

+}

+

+// ImageResolutionOptions provides the "--source" flag to commands that deal with images

+// and need to provide extra capabilities for working with ImageStreamTags and

+// ImageStreamImages.

+type imageResolutionOptions struct {

+	bound  bool

+	Source string

+}

+

+func (o *imageResolutionOptions) Bound() bool {

+	return o.bound

+}

+

+func (o *imageResolutionOptions) Bind(f *pflag.FlagSet) {

+	if o.Bound() {

+		return

+	}

+	f.StringVarP(&o.Source, "source", "", "istag", "The image source type; valid types are valid values are 'imagestreamtag', 'istag', 'imagestreamimage', 'isimage', and 'docker'")

+	o.bound = true

+}

+

 // useDiscoveryRESTMapper checks the server version to see if its recent enough to have

 // enough discovery information avaiable to reliably build a RESTMapper.  If not, use the

 // hardcoded mapper in this client (legacy behavior)

new file mode 100644

@@ -0,0 +1,82 @@

+package util

+

+import (

+	"fmt"

+	"strings"

+

+	"github.com/openshift/origin/pkg/client"

+	imageapi "github.com/openshift/origin/pkg/image/api"

+)

+

+// ResolveImagePullSpec resolves the provided source which can be "docker", "istag" or

+// "isimage" and returns the full Docker pull spec.

+func ResolveImagePullSpec(images client.ImageStreamImagesNamespacer, tags client.ImageStreamTagsNamespacer, source, name, defaultNamespace string) (string, error) {

+	// for Docker source, just passtrough the image name

+	if IsDocker(source) {

+		return name, nil

+	}

+	// parse the namespace from the provided image

+	namespace, image := splitNamespaceAndImage(name)

+	if len(namespace) == 0 {

+		namespace = defaultNamespace

+	}

+

+	dockerImageReference := ""

+

+	if IsImageStreamTag(source) {

+		name, tag, ok := imageapi.SplitImageStreamTag(image)

+		if !ok {

+			return "", fmt.Errorf("invalid image stream tag %q, must be of the form [NAMESPACE/]NAME:TAG", name)

+		}

+		if resolved, err := tags.ImageStreamTags(namespace).Get(name, tag); err != nil {

+			return "", fmt.Errorf("failed to get image stream tag %q: %v", name, err)

+		} else {

+			dockerImageReference = resolved.Image.DockerImageReference

+		}

+	}

+

+	if IsImageStreamImage(source) {

+		name, digest, ok := imageapi.SplitImageStreamImage(image)

+		if !ok {

+			return "", fmt.Errorf("invalid image stream image %q, must be of the form [NAMESPACE/]NAME@DIGEST", name)

+		}

+		if resolved, err := images.ImageStreamImages(namespace).Get(name, digest); err != nil {

+			return "", fmt.Errorf("failed to get image stream image %q: %v", name, err)

+		} else {

+			dockerImageReference = resolved.Image.DockerImageReference

+		}

+	}

+

+	if len(dockerImageReference) == 0 {

+		return "", fmt.Errorf("unable to resolve %s %q", source, name)

+	}

+

+	reference, err := imageapi.ParseDockerImageReference(dockerImageReference)

+	if err != nil {

+		return "", err

+	}

+	return reference.String(), nil

+}

+

+func IsDocker(source string) bool {

+	return source == "docker"

+}

+

+func IsImageStreamTag(source string) bool {

+	return source == "istag" || source == "imagestreamtag"

+}

+

+func IsImageStreamImage(source string) bool {

+	return source == "isimage" || source == "imagestreamimage"

+}

+

+func splitNamespaceAndImage(name string) (string, string) {

+	namespace := ""

+	imageName := ""

+	if parts := strings.Split(name, "/"); len(parts) == 2 {

+		namespace, imageName = parts[0], parts[1]

+	} else if len(parts) == 1 {

+		imageName = parts[0]

+	}

+	return namespace, imageName

+}

new file mode 100644

@@ -0,0 +1,99 @@

+package util

+

+import (

+	"testing"

+

+	kapi "k8s.io/kubernetes/pkg/api"

+

+	"github.com/openshift/origin/pkg/client/testclient"

+	imageapi "github.com/openshift/origin/pkg/image/api"

+)

+

+func image(pullSpec string) *imageapi.Image {

+	return &imageapi.Image{

+		ObjectMeta:           kapi.ObjectMeta{Name: "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"},

+		DockerImageReference: pullSpec,

+	}

+}

+

+func isimage(name, pullSpec string) *imageapi.ImageStreamImage {

+	i := image(pullSpec)

+	return &imageapi.ImageStreamImage{

+		ObjectMeta: kapi.ObjectMeta{Name: name, Namespace: "default"},

+		Image:      *i,

+	}

+}

+

+func istag(name, pullSpec string) *imageapi.ImageStreamTag {

+	i := image(pullSpec)

+	return &imageapi.ImageStreamTag{

+		ObjectMeta: kapi.ObjectMeta{Name: name, Namespace: "default"},

+		Image:      *i,

+	}

+}

+

+func TestResolveImagePullSpec(t *testing.T) {

+	testCases := []struct {

+		client    *testclient.Fake

+		source    string

+		input     string

+		expect    string

+		expectErr bool

+	}{

+		{

+			client: testclient.NewSimpleFake(isimage("test@sha256:foo", "registry.url/image/test:latest")),

+			source: "isimage",

+			input:  "test@sha256:foo",

+			expect: "registry.url/image/test:latest",

+		},

+		{

+			client: testclient.NewSimpleFake(istag("test:1.1", "registry.url/image/test:latest")),

+			source: "istag",

+			input:  "test:1.1",

+			expect: "registry.url/image/test:latest",

+		},

+		{

+			client: testclient.NewSimpleFake(istag("test:1.1", "registry.url/image/test:latest")),

+			source: "istag",

+			input:  "user/test:1.1",

+			expect: "registry.url/image/test:latest",

+		},

+		{

+			client: testclient.NewSimpleFake(),

+			source: "docker",

+			input:  "test:latest",

+			expect: "test:latest",

+		},

+		{

+			client:    testclient.NewSimpleFake(),

+			source:    "istag",

+			input:     "test:1.2",

+			expectErr: true,

+		},

+		{

+			client:    testclient.NewSimpleFake(),

+			source:    "istag",

+			input:     "test:1.2",

+			expectErr: true,

+		},

+		{

+			client:    testclient.NewSimpleFake(),

+			source:    "unknown",

+			input:     "",

+			expectErr: true,

+		},

+	}

+

+	for i, test := range testCases {

+		t.Logf("[%d] trying to resolve %q %s and expecting %q (expectErr=%t)", i, test.source, test.input, test.expect, test.expectErr)

+		result, err := ResolveImagePullSpec(test.client, test.client, test.source, test.input, "default")

+		if err != nil && !test.expectErr {

+			t.Errorf("[%d] unexpected error: %v", i, err)

+		} else if err == nil && test.expectErr {

+			t.Errorf("[%d] expected error but got none and result %q", i, result)

+		}

+		if test.expect != result {

+			t.Errorf("[%d] expected %q, but got %q", i, test.expect, result)

+		}

+	}

+}

@@ -134,7 +134,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/deployments/setimage"

 os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

-os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=myshinynewimage'

+os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=myshinynewimage --source=docker'

 os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" "myshinynewimage"

 os::cmd::expect_success 'oc delete dc/test-deployment-config'

 echo "set image: ok"

new file mode 100755

@@ -0,0 +1,43 @@

+#!/bin/bash

+source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"

+trap os::test::junit::reconcile_output EXIT

+

+# Cleanup cluster resources created by this test

+(

+  set +e

+  oc delete all,templates --all

+  exit 0

+) &>/dev/null

+

+

+os::test::junit::declare_suite_start "cmd/oc/set/image"

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f examples/hello-openshift/hello-pod.json'

+

+os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=openshift/ruby:2.3'

+os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" 'centos/ruby-23-centos7@sha256'

+

+os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=openshift/ruby:2.0'

+os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" 'openshift/ruby-20-centos7@sha256'

+

+os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=openshift/ruby:2.0'

+os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" 'openshift/ruby-20-centos7@sha256'

+

+os::cmd::expect_failure 'oc set image dc/test-deployment-config ruby-helloworld=openshift/ruby:XYZ'

+os::cmd::expect_failure 'oc set image dc/test-deployment-config ruby-helloworld=openshift/ruby:XYZ --source=isimage'

+

+os::cmd::expect_success 'oc set image dc/test-deployment-config ruby-helloworld=nginx --source=docker'

+os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" 'nginx'

+

+os::cmd::expect_success 'oc set image pod/hello-openshift hello-openshift=nginx --source=docker'

+os::cmd::expect_success_and_text "oc get pod/hello-openshift -o jsonpath='{.spec.containers[0].image}'" 'nginx'

+

+os::cmd::expect_success 'oc set image pod/hello-openshift hello-openshift=nginx:1.9.1 --source=docker'

+os::cmd::expect_success_and_text "oc get pod/hello-openshift -o jsonpath='{.spec.containers[0].image}'" 'nginx:1.9.1'

+

+os::cmd::expect_success 'oc set image pods,dc *=openshift/ruby:2.3 --all'

+os::cmd::expect_success_and_text "oc get pod/hello-openshift -o jsonpath='{.spec.containers[0].image}'" 'centos/ruby-23-centos7@sha256'

+os::cmd::expect_success_and_text "oc get dc/test-deployment-config -o jsonpath='{.spec.template.spec.containers[0].image}'" 'centos/ruby-23-centos7@sha256'

+

+echo "set-image: ok"

+os::test::junit::declare_suite_end