Modify the manual instalplan test case to verify the recreation

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

Diff for: pkg/controller/operators/catalog/operator.go

@@ -21,6 +21,7 @@ import (
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
 	extinf "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
@@ -959,7 +960,7 @@ func (o *Operator) nothingToUpdate(logger *logrus.Entry, sub *v1alpha1.Subscript
 // isInstallPlanMissing checks if the installplan is missing or not
 func (o *Operator) isInstallPlanMissing(sub *v1alpha1.Subscription) bool {
 	_, err := o.client.OperatorsV1alpha1().InstallPlans(sub.GetNamespace()).Get(context.TODO(), sub.Status.Install.Name, metav1.GetOptions{})
-	if err != nil {
+	if k8serrors.IsNotFound(err) {
 		return true
 	}
 	return false

Diff for: pkg/controller/registry/resolver/step_resolver.go

@@ -205,7 +205,7 @@ func (r *OperatorStepResolver) ResolveSteps(namespace string, _ SourceQuerier) (
 func (r *OperatorStepResolver) requireInstallPlanRecreate(sub *v1alpha1.Subscription) bool {
 	if sub.Status.InstallPlanRef != nil && sub.Status.State == v1alpha1.SubscriptionStateUpgradePending {
 		_, err := r.client.OperatorsV1alpha1().InstallPlans(sub.GetNamespace()).Get(context.TODO(), sub.Status.Install.Name, metav1.GetOptions{})
-		if err != nil {
+		if errors.IsNotFound(err) {
 			return true
 		}
 	}

Diff for: test/e2e/csv_e2e_test.go

@@ -3439,6 +3439,29 @@ func awaitCSV(t GinkgoTInterface, c versioned.Interface, namespace, name string,
 	return fetched, err
 }
 
+func awaitInstallPlanChanged(t GinkgoTInterface, c versioned.Interface, namespace, subName, ipName string) (string, error) {
+	var name string
+	var err error
+
+	err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+		fetched, err := c.OperatorsV1alpha1().Subscriptions(namespace).Get(context.TODO(), subName, metav1.GetOptions{})
+		if err != nil {
+			if k8serrors.IsNotFound(err) {
+				return false, nil
+			}
+			return false, err
+		}
+
+		if fetched.Status.Install.Name == ipName {
+			return false, nil
+		}
+		name = fetched.Status.Install.Name
+		return true, nil
+	})
+
+	return name, err
+}
+
 func waitForDeployment(c operatorclient.ClientInterface, name string) error {
 	return wait.Poll(pollInterval, pollDuration, func() (bool, error) {
 		_, err := c.GetDeployment(testNamespace, name)

Diff for: test/e2e/subscription_e2e_test.go

@@ -217,8 +217,24 @@ var _ = Describe("Subscription", func() {
 		require.Equal(GinkgoT(), v1alpha1.ApprovalManual, installPlan.Spec.Approval)
 		require.Equal(GinkgoT(), v1alpha1.InstallPlanPhaseRequiresApproval, installPlan.Status.Phase)
 
-		installPlan.Spec.Approved = true
-		_, err = crc.OperatorsV1alpha1().InstallPlans(testNamespace).Update(context.Background(), installPlan, metav1.UpdateOptions{})
+		// Delete the current installplan
+		err = crc.OperatorsV1alpha1().InstallPlans(testNamespace).Delete(context.Background(), installPlan.Name, metav1.DeleteOptions{})
+		require.NoError(GinkgoT(), err)
+
+		ipName, err := awaitInstallPlanChanged(GinkgoT(), crc, testNamespace, "manual-subscription", installPlan.Name)
+		require.NoError(GinkgoT(), err)
+
+		// Fetch new installplan
+		newInstallPlan, err := fetchInstallPlan(GinkgoT(), crc, ipName, buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseRequiresApproval))
+		require.NoError(GinkgoT(), err)
+		require.NotNil(GinkgoT(), newInstallPlan)
+
+		require.NotEqual(GinkgoT(), installPlan.Name, newInstallPlan.Name, "expected new installplan recreated")
+		require.Equal(GinkgoT(), v1alpha1.ApprovalManual, newInstallPlan.Spec.Approval)
+		require.Equal(GinkgoT(), v1alpha1.InstallPlanPhaseRequiresApproval, newInstallPlan.Status.Phase)
+
+		newInstallPlan.Spec.Approved = true
+		_, err = crc.OperatorsV1alpha1().InstallPlans(testNamespace).Update(context.Background(), newInstallPlan, metav1.UpdateOptions{})
 		require.NoError(GinkgoT(), err)
 
 		subscription, err = fetchSubscription(crc, testNamespace, "manual-subscription", subscriptionStateAtLatestChecker)