Merge pull request #453 from pepedocs/handle-ip-approval

MTSRE-1447: Handled manual install plan approval

Author: openshift-merge-robot

apis/addons/v1alpha1/addons_types.go

@@ -1,6 +1,8 @@
 package v1alpha1
 
 import (
+	"errors"
+
 	monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -324,6 +326,9 @@ const (
 
 	// Addon instance has been successfully installed.
 	AddonReasonInstanceInstalled = "AddonInstanceInstalled"
+
+	// Addon's Install Plan is pending due to some condition such as a manual approval.
+	AddonReasonInstallPlanPending = "AddonInstallPlanPending"
 )
 
 type AddonNamespace struct {
@@ -486,6 +491,21 @@ func (a *Addon) UpgradeCompleteForCurrentVersion() bool {
 		a.Status.UpgradePolicy.Value == AddonUpgradePolicyValueCompleted
 }
 
+// Gets the AddonInstallOLMCommon by Install Type
+func (a *Addon) GetInstallOLMCommon() (AddonInstallOLMCommon, error) {
+	switch a.Spec.Install.Type {
+	case OLMAllNamespaces:
+		if a.Spec.Install.OLMAllNamespaces != nil {
+			return a.Spec.Install.OLMAllNamespaces.AddonInstallOLMCommon, nil
+		}
+	case OLMOwnNamespace:
+		if a.Spec.Install.OLMOwnNamespace != nil {
+			return a.Spec.Install.OLMOwnNamespace.AddonInstallOLMCommon, nil
+		}
+	}
+	return AddonInstallOLMCommon{}, errors.New("addon install OLM common not found")
+}
+
 // AddonList contains a list of Addon
 // +kubebuilder:object:root=true
 type AddonList struct {

internal/controllers/addon/olm_reconciler.go

@@ -93,3 +93,38 @@ func (r *olmReconciler) Reconcile(ctx context.Context,
 func (r *olmReconciler) Name() string {
 	return OLM_RECONCILER_NAME
 }
+
+// Gets a subscription by ObjectKey
+func (r *olmReconciler) GetSubscription(
+	ctx context.Context,
+	name string,
+	namespace string,
+) (*operatorsv1alpha1.Subscription, error) {
+	destSub := operatorsv1alpha1.Subscription{}
+	key := client.ObjectKey{
+		Name:      name,
+		Namespace: namespace,
+	}
+
+	if err := r.client.Get(ctx, key, &destSub); err != nil {
+		return nil, err
+	}
+	return &destSub, nil
+}
+
+// Gets an InstallPlan by ObjectKey
+func (r *olmReconciler) GetInstallPlan(
+	ctx context.Context,
+	name string,
+	namespace string,
+) (*operatorsv1alpha1.InstallPlan, error) {
+	destIp := operatorsv1alpha1.InstallPlan{}
+	key := client.ObjectKey{
+		Name:      name,
+		Namespace: namespace,
+	}
+	if err := r.client.Get(ctx, key, &destIp); err != nil {
+		return nil, err
+	}
+	return &destIp, nil
+}

internal/controllers/addon/phase_ensure_subscription.go

@@ -30,15 +30,11 @@ func (r *olmReconciler) ensureSubscription(
 	client.ObjectKey,
 	error,
 ) {
-	var commonInstallOptions addonsv1alpha1.AddonInstallOLMCommon
-	switch addon.Spec.Install.Type {
-	case addonsv1alpha1.OLMAllNamespaces:
-		commonInstallOptions = addon.Spec.Install.
-			OLMAllNamespaces.AddonInstallOLMCommon
-	case addonsv1alpha1.OLMOwnNamespace:
-		commonInstallOptions = addon.Spec.Install.
-			OLMOwnNamespace.AddonInstallOLMCommon
+	commonInstallOptions, err := addon.GetInstallOLMCommon()
+	if err != nil {
+		return resultNil, client.ObjectKey{}, err
 	}
+
 	subscriptionConfigObject := createSubscriptionConfigObject(commonInstallOptions)
 	desiredSubscription := &operatorsv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
@@ -108,11 +104,11 @@ func (r *olmReconciler) reconcileSubscription(
 	ctx context.Context,
 	subscription *operatorsv1alpha1.Subscription,
 ) (currentSubscription *operatorsv1alpha1.Subscription, err error) {
-	currentSubscription = &operatorsv1alpha1.Subscription{}
-	err = r.client.Get(ctx, client.ObjectKey{
-		Name:      subscription.Name,
-		Namespace: subscription.Namespace,
-	}, currentSubscription)
+	currentSubscription, err = r.GetSubscription(
+		ctx,
+		subscription.Name,
+		subscription.Namespace,
+	)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			return subscription, r.client.Create(ctx, subscription)

internal/controllers/addon/phase_observe_operatorresource.go

@@ -20,6 +20,37 @@ func (r *olmReconciler) observeOperatorResource(
 	addon *addonsv1alpha1.Addon,
 	csvKey client.ObjectKey,
 ) (requeueResult, error) {
+	installOLMCommon, err := addon.GetInstallOLMCommon()
+	if err != nil {
+		return resultRetry, err
+	}
+
+	currentSub, err := r.GetSubscription(
+		ctx,
+		SubscriptionName(addon),
+		installOLMCommon.Namespace,
+	)
+	if err != nil {
+		return resultRetry, err
+	}
+
+	if currentSub.GetInstallPlanApproval() == operatorsv1alpha1.ApprovalManual {
+		currentIp, err := r.GetInstallPlan(
+			ctx,
+			currentSub.Status.InstallPlanRef.Name,
+			currentSub.Status.InstallPlanRef.Namespace,
+		)
+		if err != nil {
+			return resultNil, err
+		}
+
+		if currentIp.Status.Phase == operatorsv1alpha1.InstallPlanPhaseRequiresApproval {
+			reportInstallPlanPending(addon)
+			// CSV will not be available at this stage
+			return resultNil, nil
+		}
+	}
+
 	operatorKey := client.ObjectKey{
 		Namespace: "",
 		Name:      generateOperatorResourceName(addon),