WIP: e2e tests

Signed-off-by: Mikalai Radchuk <[email protected]>

Author: Mikalai Radchuk

pkg/controller/bundle/bundle_unpacker.go

@@ -38,7 +38,7 @@ const (
 	BundleLookupFailed operatorsv1alpha1.BundleLookupConditionType = "BundleLookupFailed"
 
 	// TODO: This can be a spec field
-	// BundleUnpackTimeoutAnnotationKey allows setting a bundle unpack timeout per InstallPlan
+	// BundleUnpackTimeoutAnnotationKey allows setting a bundle unpack timeout per OperatorGroup
 	// and overrides the default specified by the --bundle-unpack-timeout flag
 	// The time duration should be in the same format as accepted by time.ParseDuration()
 	// e.g 1m30s

pkg/controller/operators/catalog/operator.go

@@ -46,6 +46,7 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/informers/externalversions"
+	v1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1"
 	operatorsv1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle"
 	olmerrors "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/errors"
@@ -934,7 +935,42 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
 		return err
 	}
 
-	failForwardEnabled, err := resolver.IsFailForwardEnabled(o.lister.OperatorsV1().OperatorGroupLister().OperatorGroups(namespace))
+	ogLister := o.lister.OperatorsV1().OperatorGroupLister().OperatorGroups(namespace)
+	failForwardEnabled, err := resolver.IsFailForwardEnabled(ogLister)
+	if err != nil {
+		return err
+	}
+
+	// TODO: Move into a separate func (probably into the github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle package)
+	// operatorGroupBundleUnpackTimeout returns bundle timeout from annotation if specified.
+	// This is to overrides the --bundle-unpack-timeout flag value on per-OperatorGroup basis.
+	// If the timeout cannot be parsed it's set to < 0 and subsequently ignored.
+	operatorGroupBundleUnpackTimeout := func(logger *logrus.Logger, ogLister v1listers.OperatorGroupNamespaceLister) (time.Duration, error) {
+		ignoreTimeout := -1 * time.Minute
+
+		ogs, err := ogLister.List(labels.Everything())
+		if err != nil || len(ogs) == 0 {
+			return ignoreTimeout, nil
+		}
+		if len(ogs) != 1 {
+			return ignoreTimeout, fmt.Errorf("found %d operatorGroups, expected 1", len(ogs))
+		}
+
+		timeoutStr, ok := ogs[0].GetAnnotations()[bundle.BundleUnpackTimeoutAnnotationKey]
+		if !ok {
+			return ignoreTimeout, nil
+		}
+
+		d, err := time.ParseDuration(timeoutStr)
+		if err != nil {
+			logger.Errorf("failed to parse unpack timeout annotation(%s: %s): %v", bundle.BundleUnpackTimeoutAnnotationKey, timeoutStr, err)
+			return ignoreTimeout, nil
+		}
+
+		return d, nil
+	}
+
+	unpackTimeout, err := operatorGroupBundleUnpackTimeout(o.logger, ogLister)
 	if err != nil {
 		return err
 	}
@@ -1034,7 +1070,7 @@ func (o *Operator) syncResolvingNamespace(obj interface{}) error {
 		logger.Debug("unpacking bundles")
 
 		var unpacked bool
-		unpacked, steps, bundleLookups, err = o.unpackBundles(namespace, bundleLookups)
+		unpacked, steps, bundleLookups, err = o.unpackBundles(namespace, bundleLookups, unpackTimeout)
 		if err != nil {
 			return fmt.Errorf("bundle unpacking failed with an error: %v", err)
 		}
@@ -1456,28 +1492,14 @@ type UnpackedBundleReference struct {
 	Properties             string `json:"properties"`
 }
 
-func (o *Operator) unpackBundles(namespace string, bundleLookups []v1alpha1.BundleLookup) (bool, []*v1alpha1.Step, []v1alpha1.BundleLookup, error) {
+func (o *Operator) unpackBundles(namespace string, bundleLookups []v1alpha1.BundleLookup, unpackTimeout time.Duration) (bool, []*v1alpha1.Step, []v1alpha1.BundleLookup, error) {
 	unpacked := true
 
 	outBundleLookups := make([]v1alpha1.BundleLookup, len(bundleLookups))
 	for i := range bundleLookups {
 		bundleLookups[i].DeepCopyInto(&outBundleLookups[i])
 	}
 
-	// The bundle timeout annotation if specified overrides the --bundle-unpack-timeout flag value
-	// If the timeout cannot be parsed it's set to < 0 and subsequently ignored
-	unpackTimeout := -1 * time.Minute
-	// TODO: Update. This is internal stuff for testing. Maybe move to a sub?
-	// timeoutStr, ok := plan.GetAnnotations()[bundle.BundleUnpackTimeoutAnnotationKey]
-	// if ok {
-	// 	d, err := time.ParseDuration(timeoutStr)
-	// 	if err != nil {
-	// 		o.logger.Errorf("failed to parse unpack timeout annotation(%s: %s): %v", bundle.BundleUnpackTimeoutAnnotationKey, timeoutStr, err)
-	// 	} else {
-	// 		unpackTimeout = d
-	// 	}
-	// }
-
 	installPlanSteps := []*v1alpha1.Step{}
 	var errs []error
 	for i := 0; i < len(outBundleLookups); i++ {