@@ -19859,6 +19859,10 @@

      "insecure": {

       "type": "boolean",

       "description": "if true, the server may bypass certificate verification or connect directly over HTTP during image import"

+     },

+     "scheduled": {

+      "type": "boolean",

+      "description": "if true, the server will periodically check to ensure this tag is up to date"

      }

     }

    },

@@ -2352,6 +2352,7 @@ func deepCopy_api_TagEventList(in imageapi.TagEventList, out *imageapi.TagEventL

 func deepCopy_api_TagImportPolicy(in imageapi.TagImportPolicy, out *imageapi.TagImportPolicy, c *conversion.Cloner) error {

 	out.Insecure = in.Insecure

+	out.Scheduled = in.Scheduled

 	return nil

 }

@@ -4114,6 +4114,7 @@ func autoconvert_api_TagImportPolicy_To_v1_TagImportPolicy(in *imageapi.TagImpor

 		defaulting.(func(*imageapi.TagImportPolicy))(in)

 	}

 	out.Insecure = in.Insecure

+	out.Scheduled = in.Scheduled

 	return nil

 }

@@ -4526,6 +4527,7 @@ func autoconvert_v1_TagImportPolicy_To_api_TagImportPolicy(in *imageapiv1.TagImp

 		defaulting.(func(*imageapiv1.TagImportPolicy))(in)

 	}

 	out.Insecure = in.Insecure

+	out.Scheduled = in.Scheduled

 	return nil

 }

@@ -2275,6 +2275,7 @@ func deepCopy_v1_TagEventCondition(in imageapiv1.TagEventCondition, out *imageap

 func deepCopy_v1_TagImportPolicy(in imageapiv1.TagImportPolicy, out *imageapiv1.TagImportPolicy, c *conversion.Cloner) error {

 	out.Insecure = in.Insecure

+	out.Scheduled = in.Scheduled

 	return nil

 }

@@ -2112,6 +2112,7 @@ func deepCopy_v1beta3_TagEventCondition(in imageapiv1beta3.TagEventCondition, ou

 func deepCopy_v1beta3_TagImportPolicy(in imageapiv1beta3.TagImportPolicy, out *imageapiv1beta3.TagImportPolicy, c *conversion.Cloner) error {

 	out.Insecure = in.Insecure

+	out.Scheduled = in.Scheduled

 	return nil

 }

@@ -112,6 +112,8 @@ type TagReference struct {

 type TagImportPolicy struct {

 	// Insecure is true if the server may bypass certificate verification or connect directly over HTTP during image import.

 	Insecure bool

+	// Scheduled indicates to the server that this tag should be periodically checked to ensure it is up to date, and imported

+	Scheduled bool

 }

 // ImageStreamStatus contains information about the state of this image stream.

@@ -195,7 +195,8 @@ func init() {

 					Annotations: curr.Annotations,

 					Reference:   curr.Reference,

 					ImportPolicy: newer.TagImportPolicy{

-						Insecure: curr.ImportPolicy.Insecure,

+						Insecure:  curr.ImportPolicy.Insecure,

+						Scheduled: curr.ImportPolicy.Scheduled,

 					},

 				}

 				if curr.Generation != nil {

@@ -223,7 +224,8 @@ func init() {

 					Annotations: newTagReference.Annotations,

 					Reference:   newTagReference.Reference,

 					ImportPolicy: TagImportPolicy{

-						Insecure: newTagReference.ImportPolicy.Insecure,

+						Insecure:  newTagReference.ImportPolicy.Insecure,

+						Scheduled: newTagReference.ImportPolicy.Scheduled,

 					},

 				}

 				if newTagReference.Generation != nil {

@@ -90,6 +90,8 @@ type NamedTagReference struct {

 type TagImportPolicy struct {

 	// Insecure is true if the server may bypass certificate verification or connect directly over HTTP during image import.

 	Insecure bool `json:"insecure,omitempty" description:"if true, the server may bypass certificate verification or connect directly over HTTP during image import"`

+	// Scheduled indicates to the server that this tag should be periodically checked to ensure it is up to date, and imported

+	Scheduled bool `json:"scheduled,omitempty" description:"if true, the server will periodically check to ensure this tag is up to date"`

 }

 // ImageStreamStatus contains information about the state of this image stream.

@@ -243,7 +243,8 @@ func init() {

 					Annotations: curr.Annotations,

 					Reference:   curr.Reference,

 					ImportPolicy: newer.TagImportPolicy{

-						Insecure: curr.ImportPolicy.Insecure,

+						Insecure:  curr.ImportPolicy.Insecure,

+						Scheduled: curr.ImportPolicy.Scheduled,

 					},

 				}

 				if curr.Generation != nil {

@@ -271,7 +272,8 @@ func init() {

 					Annotations: newTagReference.Annotations,

 					Reference:   newTagReference.Reference,

 					ImportPolicy: TagImportPolicy{

-						Insecure: newTagReference.ImportPolicy.Insecure,

+						Insecure:  newTagReference.ImportPolicy.Insecure,

+						Scheduled: newTagReference.ImportPolicy.Scheduled,

 					},

 				}

 				if newTagReference.Generation != nil {

@@ -85,6 +85,8 @@ type NamedTagReference struct {

 type TagImportPolicy struct {

 	// Insecure is true if the server may bypass certificate verification or connect directly over HTTP during image import.

 	Insecure bool `json:"insecure,omitempty" description:"if true, the server may bypass certificate verification or connect directly over HTTP during image import"`

+	// Scheduled indicates to the server that this tag should be periodically checked to ensure it is up to date, and imported

+	Scheduled bool `json:"scheduled,omitempty" description:"if true, the server will periodically check to ensure this tag is up to date"`

 }

 // ImageStreamStatus contains information about the state of this image stream.

@@ -95,7 +95,14 @@ func ValidateImageStream(stream *api.ImageStream) field.ErrorList {

 	for tag, tagRef := range stream.Spec.Tags {

 		if tagRef.From != nil {

 			switch tagRef.From.Kind {

-			case "DockerImage", "ImageStreamImage", "ImageStreamTag":

+			case "DockerImage":

+				if ref, err := api.ParseDockerImageReference(stream.Spec.DockerImageRepository); err == nil && tagRef.ImportPolicy.Scheduled && len(ref.ID) > 0 {

+					result = append(result, field.Invalid(field.NewPath("spec", "tags").Key(tag).Child("from", "name"), tagRef.From.Name, "only tags can be scheduled for import"))

+				}

+			case "ImageStreamImage", "ImageStreamTag":

+				if tagRef.ImportPolicy.Scheduled {

+					result = append(result, field.Invalid(field.NewPath("spec", "tags").Key(tag).Child("importPolicy", "scheduled"), tagRef.ImportPolicy.Scheduled, "only tags pointing to Docker repositories may be scheduled for background import"))

+				}

 			default:

 				result = append(result, field.Invalid(field.NewPath("spec", "tags").Key(tag).Child("from", "kind"), tagRef.From.Kind, "valid values are 'DockerImage', 'ImageStreamImage', 'ImageStreamTag'"))

 			}

@@ -191,8 +198,12 @@ func ValidateImageStreamImport(isi *api.ImageStreamImport) field.ErrorList {

 			if len(spec.From.Name) == 0 {

 				errs = append(errs, field.Required(imagesPath.Index(i).Child("from", "name")))

 			} else {

-				if _, err := api.ParseDockerImageReference(spec.From.Name); err != nil {

+				if ref, err := api.ParseDockerImageReference(spec.From.Name); err != nil {

 					errs = append(errs, field.Invalid(imagesPath.Index(i).Child("from", "name"), spec.From.Name, err.Error()))

+				} else {

+					if len(ref.ID) > 0 && spec.ImportPolicy.Scheduled {

+						errs = append(errs, field.Invalid(imagesPath.Index(i).Child("from", "name"), spec.From.Name, "only tags can be scheduled for import"))

+					}

 				}

 			}

 		default:

@@ -207,8 +218,12 @@ func ValidateImageStreamImport(isi *api.ImageStreamImport) field.ErrorList {

 			if len(spec.From.Name) == 0 {

 				errs = append(errs, field.Required(repoPath.Child("from", "name")))

 			} else {

-				if _, err := api.ParseDockerImageReference(spec.From.Name); err != nil {

-					errs = append(errs, field.Invalid(repoPath.Child("from", "name"), spec.From.Name, err.Error()))

+				if ref, err := api.ParseDockerImageReference(from.Name); err != nil {

+					errs = append(errs, field.Invalid(repoPath.Child("from", "name"), from.Name, err.Error()))

+				} else {

+					if len(ref.ID) > 0 || len(ref.Tag) > 0 {

+						errs = append(errs, field.Invalid(repoPath.Child("from", "name"), from.Name, "you must specify an image repository, not a tag or ID"))

+					}

 				}

 			}

 		default:

@@ -276,6 +276,29 @@ func TestValidateImageStream(t *testing.T) {

 				field.Required(field.NewPath("status", "tags").Key("tag").Child("items").Index(2).Child("dockerImageReference")),

 			},

 		},

+		"only DockerImage tags can be scheduled": {

+			namespace: "namespace",

+			name:      "foo",

+			specTags: map[string]api.TagReference{

+				"tag": {

+					From: &kapi.ObjectReference{

+						Kind: "DockerImage",

+						Name: "abc",

+					},

+					ImportPolicy: api.TagImportPolicy{Scheduled: true},

+				},

+				"other": {

+					From: &kapi.ObjectReference{

+						Kind: "ImageStreamTag",

+						Name: "other:latest",

+					},

+					ImportPolicy: api.TagImportPolicy{Scheduled: true},

+				},

+			},

+			expected: field.ErrorList{

+				field.Invalid(field.NewPath("spec", "tags").Key("other").Child("importPolicy", "scheduled"), true, "only tags pointing to Docker repositories may be scheduled for background import"),

+			},

+		},

 		"valid": {

 			namespace: "namespace",

 			name:      "foo",