Merge pull request #9925 from kargakis/update-defaults-for-dcs

Merged by openshift-bot

Author: OpenShift Bot

pkg/deploy/api/v1/defaults.go

@@ -100,8 +100,9 @@ func SetDefaults_RollingDeploymentStrategyParams(obj *RollingDeploymentStrategyP
 func SetDefaults_DeploymentConfig(obj *DeploymentConfig) {
 	for _, t := range obj.Spec.Triggers {
 		if t.ImageChangeParams != nil {
+			// Default unconditionally for transforming old data.
 			t.ImageChangeParams.From.Kind = "ImageStreamTag"
-			if len(t.ImageChangeParams.From.Name) > 0 && len(t.ImageChangeParams.From.Namespace) == 0 {
+			if len(t.ImageChangeParams.From.Namespace) == 0 {
 				t.ImageChangeParams.From.Namespace = obj.Namespace
 			}
 		}

pkg/deploy/api/validation/validation.go

@@ -439,7 +439,7 @@ func validateImageChangeParams(params *deployapi.DeploymentTriggerImageChangePar
 func validateImageStreamTagName(istag string) error {
 	name, _, ok := imageapi.SplitImageStreamTag(istag)
 	if !ok {
-		return fmt.Errorf("invalid ImageStreamTag: %s", istag)
+		return fmt.Errorf("must be in the form of <name>:<tag>")
 	}
 	if reasons := imageval.ValidateImageStreamName(name, false); len(reasons) != 0 {
 		return errors.New(strings.Join(reasons, ", "))