From 517ad26b647b92e9aefc249d97419f5b37847ab0 Mon Sep 17 00:00:00 2001 From: deads2k Date: Mon, 21 Dec 2015 10:30:04 -0500 Subject: [PATCH] comments --- pkg/cmd/server/origin/run_components.go | 4 ++-- pkg/image/controller/controller.go | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/server/origin/run_components.go b/pkg/cmd/server/origin/run_components.go index ae248772c314..116e1dd91eea 100644 --- 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 index 85d371d9ec74..459ae149b820 100644 --- 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 }