Verify CAPIO deployment is removed

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

test/e2e/suites/chart-upgrade/chart_upgrade_test.go

@@ -59,6 +59,7 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL
 
 		testenv.DeployChartMuseum(ctx, chartMuseumDeployInput)
 
+		// Perform upgrade with migration to embedded operator implementation
 		rtInput.AdditionalValues["cluster-api-operator.enabled"] = "false"
 		rtInput.AdditionalValues["rancherTurtles.features.embedded-operator.enabled"] = "true"
 
@@ -68,6 +69,17 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL
 			PostUpgradeSteps:      []func(){},
 		}
 
+		upgradeInput.PostUpgradeSteps = append(upgradeInput.PostUpgradeSteps, func() {
+			By("Waiting for the upstream CAPI operator deployment to be removed")
+			framework.WaitForDeploymentsRemoved(ctx, framework.WaitForDeploymentsRemovedInput{
+				Getter: bootstrapClusterProxy.GetClient(),
+				Deployment: &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{
+					Name:      "rancher-turtles-cluster-api-operator",
+					Namespace: e2e.RancherTurtlesNamespace,
+				}},
+			}, e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
+		})
+
 		upgradeInput.PostUpgradeSteps = append(upgradeInput.PostUpgradeSteps, func() {
 			By("Waiting for CAAPF deployment to be available")
 			capiframework.WaitForDeploymentsAvailable(ctx, capiframework.WaitForDeploymentsAvailableInput{

test/framework/turtles.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"strings"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 
@@ -71,3 +72,25 @@ func WaitForCAPIProviderRollout(ctx context.Context, input WaitForCAPIProviderRo
 			client.ObjectKeyFromObject(input.Deployment).String(), input.Image, klog.KObj(input.Deployment))
 	}
 }
+
+// WaitForDeploymentsRemovedInput is the input for WaitForDeploymentsRemoved.
+type WaitForDeploymentsRemovedInput = capiframework.WaitForDeploymentsAvailableInput
+
+// WaitForDeploymentsAvRemoved waits until the Deployment is removed.
+func WaitForDeploymentsRemoved(ctx context.Context, input WaitForDeploymentsRemovedInput, intervals ...interface{}) {
+	Byf("Waiting for deployment %s to be removed", klog.KObj(input.Deployment))
+	deployment := &appsv1.Deployment{}
+	Eventually(func() bool {
+		key := client.ObjectKey{
+			Namespace: input.Deployment.GetNamespace(),
+			Name:      input.Deployment.GetName(),
+		}
+		if err := input.Getter.Get(ctx, key, deployment); err == nil {
+			return false
+		} else if apierrors.IsNotFound(err) {
+			return true
+		}
+
+		return false
+	}, intervals...).Should(BeTrue(), func() string { return capiframework.DescribeFailedDeployment(input, deployment) })
+}