comments

openshift · Dec 21, 2015 · 517ad26 · 517ad26
1 parent ab44513
commit 517ad26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pkg/cmd/server/origin/run_components.go b/pkg/cmd/server/origin/run_components.go
@@ -20,9 +20,9 @@ import (
 	buildclient "github.com/openshift/origin/pkg/build/client"
 	buildcontrollerfactory "github.com/openshift/origin/pkg/build/controller/factory"
 	buildstrategy "github.com/openshift/origin/pkg/build/controller/strategy"
+	"github.com/openshift/origin/pkg/client"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
-	"github.com/openshift/origin/pkg/client"
 	configchangecontroller "github.com/openshift/origin/pkg/deploy/controller/configchange"
 	deployerpodcontroller "github.com/openshift/origin/pkg/deploy/controller/deployerpod"
 	deploycontroller "github.com/openshift/origin/pkg/deploy/controller/deployment"
@@ -346,7 +346,7 @@ func (c *MasterConfig) RunSDNController() {
 // RunImageImportController starts the image import trigger controller process.
 func (c *MasterConfig) RunImageImportController() {
 	osclient := c.ImageImportControllerClient()
-	controller := imagecontroller.NewImportController(client.ImageStreamsNamespacer(osclient), client.ImageStreamMappingsNamespace(osclient), 10, 2*time.Minute)
+	controller := imagecontroller.NewImportController(client.ImageStreamsNamespacer(osclient), client.ImageStreamMappingsNamespacer(osclient), 10, 2*time.Minute)
 	controller.Run()
 }
 

diff --git a/pkg/image/controller/controller.go b/pkg/image/controller/controller.go
@@ -8,6 +8,7 @@ import (
 	"github.com/golang/glog"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	kapierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/cache"
 	kclient "k8s.io/kubernetes/pkg/client/unversioned"
@@ -80,7 +81,7 @@ func (c *ImportController) Run() {
 		go c.imageStreamController.Run(c.stopChan)
 
 		for i := 0; i < c.numParallelImports; i++ {
-			go c.handleImport()
+			go util.Until(c.handleImport, time.Second, c.stopChan)
 		}
 	}
 }
@@ -154,6 +155,10 @@ func (c *ImportController) importImageStream(staleImageStream *api.ImageStream)
 
 	err := kclient.RetryOnConflict(kclient.DefaultBackoff, func() error {
 		liveImageStream, err := c.streams.ImageStreams(staleImageStream.Namespace).Get(staleImageStream.Name)
+		// no work to do here
+		if kapierrors.IsNotFound(err) {
+			return nil
+		}
 		if err != nil {
 			return err
 		}