another go

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

pkg/controller/operators/catalog/operator.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"k8s.io/apimachinery/pkg/types"
 	"reflect"
 	"sort"
 	"strings"
@@ -1492,10 +1493,16 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
 		}
 	}
 
+	// ************************************************ WARNING ************************************************* //
+	// if updateSubscriptionStatuses call fails and the IP reference was changed in this run,                     //
+	// we'll be screwed because the IP would have been created but the subscription won't carry its reference.    //
+	// And if the CSV gets created by the IP, it won't be associated with the Subscription                        //
+	// -> perma-failure on resolution                                                                             //
+	// ********************************************************************************************************** //
 	// Update subscriptions with all changes so far
-	_, updateErr := o.updateSubscriptionStatuses(subs)
+	_, updateErr := o.patchSubscriptionStatuses(subs)
 	if updateErr != nil {
-		logger.WithError(updateErr).Warn("failed to update subscription conditions")
+		logger.WithError(updateErr).Warn("failed to patch subscription conditions")
 		return updateErr
 	}
 
@@ -1667,15 +1674,23 @@ func (o *Operator) ensureInstallPlan(logger *logrus.Entry, namespace string, gen
 	}
 	logger.Warn("no installplan found with matching generation, creating new one")
 
-	return o.createInstallPlan(namespace, gen, subs, installPlanApproval, steps, bundleLookups)
+	// **************************** WARNING **************************** //
+	// If this call fails, after the IP is created, the IP will never
+	// do anything since it requires the steps to exist in .status
+	// ***************************************************************** //
+	ip, err := o.createInstallPlan(namespace, gen, subs, installPlanApproval, steps, bundleLookups)
+	if err != nil {
+		return nil, err
+	}
+	return reference.GetReference(ip)
 }
 
 func (o *Operator) createInstallPlan(namespace string, gen int, subs []*v1alpha1.Subscription, installPlanApproval v1alpha1.Approval, steps []*v1alpha1.Step, bundleLookups []v1alpha1.BundleLookup) (*corev1.ObjectReference, error) {
 	if len(steps) == 0 && len(bundleLookups) == 0 {
 		return nil, nil
 	}
 
-	csvNames := []string{}
+	var csvNames []string
 	catalogSourceMap := map[string]struct{}{}
 	for _, s := range steps {
 		if s.Resource.Kind == "ClusterServiceVersion" {
@@ -1684,7 +1699,7 @@ func (o *Operator) createInstallPlan(namespace string, gen int, subs []*v1alpha1
 		catalogSourceMap[s.Resource.CatalogSource] = struct{}{}
 	}
 
-	catalogSources := []string{}
+	var catalogSources []string
 	for s := range catalogSourceMap {
 		catalogSources = append(catalogSources, s)
 	}
@@ -1720,6 +1735,7 @@ func (o *Operator) createInstallPlan(namespace string, gen int, subs []*v1alpha1
 		CatalogSources: catalogSources,
 		BundleLookups:  bundleLookups,
 	}
+
 	res, err = o.client.OperatorsV1alpha1().InstallPlans(namespace).UpdateStatus(context.TODO(), res, metav1.UpdateOptions{})
 	if err != nil {
 		return nil, err
@@ -1763,6 +1779,56 @@ func (o *Operator) removeSubsCond(subs []*v1alpha1.Subscription, condType v1alph
 	}
 }
 
+func (o *Operator) patchSubscriptionStatuses(subs []*v1alpha1.Subscription) ([]*v1alpha1.Subscription, error) {
+	var (
+		errs      []error
+		mu        sync.Mutex
+		wg        sync.WaitGroup
+		patchOpts = metav1.PatchOptions{}
+	)
+
+	lastUpdated := o.now()
+
+	for _, sub := range subs {
+		wg.Add(1)
+		go func(sub *v1alpha1.Subscription) {
+			defer wg.Done()
+
+			patch := map[string]interface{}{
+				"status": map[string]interface{}{
+					"conditions":            sub.Status.Conditions,
+					"currentCSV":            sub.Status.CurrentCSV,
+					"installPlanRef":        sub.Status.InstallPlanRef,
+					"installPlan":           sub.Status.Install,
+					"installPlanGeneration": sub.Status.InstallPlanGeneration,
+					"lastUpdated":           lastUpdated,
+				},
+			}
+
+			patchBytes, err := json.Marshal(patch)
+			if err != nil {
+				errs = append(errs, err)
+				return
+			}
+
+			if _, err := o.client.OperatorsV1alpha1().Subscriptions(sub.Namespace).Patch(
+				context.TODO(),
+				sub.GetName(),
+				types.MergePatchType,
+				patchBytes,
+				patchOpts,
+				"status",
+			); err != nil {
+				mu.Lock()
+				defer mu.Unlock()
+				errs = append(errs, err)
+			}
+		}(sub)
+	}
+	wg.Wait()
+	return subs, utilerrors.NewAggregate(errs)
+}
+
 func (o *Operator) updateSubscriptionStatuses(subs []*v1alpha1.Subscription) ([]*v1alpha1.Subscription, error) {
 	var (
 		errs       []error