Merge pull request #20623 from bparees/isi_import

skip import call when there is nothing to import

Author: openshift-merge-robot

pkg/image/controller/imagestream_controller.go

@@ -265,6 +265,10 @@ func handleImageStream(
 			ImportPolicy: imageapi.TagImportPolicy{Insecure: insecure},
 		}
 	}
+	if isi.Spec.Repository == nil && len(isi.Spec.Images) == 0 {
+		glog.V(4).Infof("Did not find any tags or repository needing import")
+		return nil, nil
+	}
 	result, err := client.ImageStreamImports(stream.Namespace).CreateWithoutTimeout(isi)
 	if err != nil {
 		if apierrs.IsNotFound(err) && isStatusErrorKind(err, "imageStream") {

pkg/image/controller/imagestream_controller_test.go

@@ -328,6 +328,28 @@ func TestHandleImageStream(t *testing.T) {
 				},
 			},
 		},
+		// spec tag with generation with current status generation will be ignored
+		{
+			stream: &imageapi.ImageStream{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{imageapi.DockerImageRepositoryCheckAnnotation: metav1.Now().UTC().Format(time.RFC3339)},
+					Name:        "test",
+					Namespace:   "other",
+				},
+				Spec: imageapi.ImageStreamSpec{
+					Tags: map[string]imageapi.TagReference{
+						"latest": {
+							From:       &kapi.ObjectReference{Kind: "DockerImage", Name: "test/other:latest"},
+							Generation: &two,
+						},
+					},
+				},
+				Status: imageapi.ImageStreamStatus{
+					Tags: map[string]imageapi.TagEventList{"latest": {Items: []imageapi.TagEvent{{Generation: 2}}}},
+				},
+			},
+			expected: nil,
+		},
 	}
 
 	for i, test := range testCases {