Merge pull request #816 from ecordell/udpate-catalog

Update catalog if image changes

Author: ecordell

manifests/0000_50_olm_09-aggregated.clusterrole.yaml

@@ -25,5 +25,8 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
 - apiGroups: ["operators.coreos.com"]
-  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "packagemanifests"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: ["packages.operators.coreos.com"]
+  resources: ["packagemanifests"]
   verbs: ["get", "list", "watch"]

pkg/controller/operators/catalog/operator.go

@@ -323,22 +323,6 @@ func (o *Operator) handleDeletion(obj interface{}) {
 		return
 	}
 
-	// Check the registry server
-	checker := o.reconciler.ReconcilerForSource(catsrc)
-	healthy, err := checker.CheckRegistryServer(catsrc)
-	if err != nil {
-		logger.WithError(err).Warn("error checking registry health")
-	} else if !healthy {
-		logger.Debug("registry server unhealthy, updating catalog source")
-		catsrc.Status.RegistryServiceStatus = nil
-		_, err = o.client.OperatorsV1alpha1().CatalogSources(catsrc.GetNamespace()).UpdateStatus(catsrc)
-		if err == nil {
-			logger.Debug("successfully updated catalogsource registry status")
-			return
-		}
-		logger.WithError(err).Warn("error updating catalogsource registry status")
-	}
-
 	// Requeue CatalogSource
 	if err := o.catSrcQueueSet.Requeue(catsrc.GetName(), catsrc.GetNamespace()); err != nil {
 		logger.WithError(err).Warn("error requeuing owner catalogsource")
@@ -429,17 +413,22 @@ func (o *Operator) syncCatalogSources(obj interface{}) (syncError error) {
 		logger.Debug("catsrc configmap state good, checking registry pod")
 	}
 
-	reconciler := o.reconciler.ReconcilerForSource(catsrc)
-	if reconciler == nil {
+	srcReconciler := o.reconciler.ReconcilerForSource(catsrc)
+	if srcReconciler == nil {
 		// TODO: Add failure status on catalogsource and remove from sources
 		return fmt.Errorf("no reconciler for source type %s", catsrc.Spec.SourceType)
 	}
 
+	healthy, err := srcReconciler.CheckRegistryServer(catsrc)
+	if err != nil {
+		return err
+	}
+
 	// If registry pod hasn't been created or hasn't been updated since the last configmap update, recreate it
-	if catsrc.Status.RegistryServiceStatus == nil || catsrc.Status.RegistryServiceStatus.CreatedAt.Before(&catsrc.Status.LastSync) {
+	if !healthy || catsrc.Status.RegistryServiceStatus == nil || catsrc.Status.RegistryServiceStatus.CreatedAt.Before(&catsrc.Status.LastSync) {
 		logger.Debug("ensuring registry server")
 
-		if err := reconciler.EnsureRegistryServer(out); err != nil {
+		if err := srcReconciler.EnsureRegistryServer(out); err != nil {
 			logger.WithError(err).Warn("couldn't ensure registry server")
 			return err
 		}
@@ -914,7 +903,7 @@ func (o *Operator) createInstallPlan(namespace string, subs []*v1alpha1.Subscrip
 func (o *Operator) requeueSubscription(name, namespace string) {
 	// we can build the key directly, will need to change if queue uses different key scheme
 	key := fmt.Sprintf("%s/%s", namespace, name)
-	o.subQueue.AddRateLimited(key)
+	o.subQueue.Add(key)
 	return
 }