Skip to content

fix: wait for eventual deletion of installplan e2e test objects #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: wait for eventual deletion of installplan e2e test objects #1648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 85 additions & 23 deletions test/e2e/installplan_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,19 @@ import (
"github.com/blang/semver"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
opver "github.com/operator-framework/api/pkg/lib/version"
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
operatorsv1alpha1 "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/controller/registry"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/apis/rbac"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

appsv1 "k8s.io/api/apps/v1"
authorizationv1 "k8s.io/api/authorization/v1"
corev1 "k8s.io/api/core/v1"
Expand All @@ -23,16 +34,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/util/retry"

opver "github.com/operator-framework/api/pkg/lib/version"
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
operatorsv1alpha1 "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/controller/registry"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/apis/rbac"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
)

var _ = Describe("Install Plan", func() {
Expand Down Expand Up @@ -373,7 +374,6 @@ var _ = Describe("Install Plan", func() {

dependentCRDPlural := genName("ins-")
dependentCRD := newCRD(dependentCRDPlural)

// Create new CSVs
mainStableCSV := newCSV(mainPackageStable, testNamespace, "", semver.MustParse("0.1.0"), []apiextensions.CustomResourceDefinition{mainCRD}, []apiextensions.CustomResourceDefinition{dependentCRD}, mainNamedStrategy)
mainBetaCSV := newCSV(mainPackageBeta, testNamespace, mainPackageStable, semver.MustParse("0.2.0"), []apiextensions.CustomResourceDefinition{mainCRD}, []apiextensions.CustomResourceDefinition{dependentCRD}, mainNamedStrategy)
Expand Down Expand Up @@ -441,9 +441,27 @@ var _ = Describe("Install Plan", func() {
err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(context.TODO(), *metav1.NewDeleteOptions(0), metav1.ListOptions{})
require.NoError(GinkgoT(), err)

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subscription.GetName(), metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// Delete orphaned csv
require.NoError(GinkgoT(), crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), mainStableCSV.GetName(), metav1.DeleteOptions{}))

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), mainStableCSV.GetName(), metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// existing cleanup should remove this
createSubscriptionForCatalog(crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, betaChannel, "", operatorsv1alpha1.ApprovalAutomatic)

Expand Down Expand Up @@ -819,16 +837,12 @@ var _ = Describe("Install Plan", func() {
require.NoError(GinkgoT(), err)

// Update the subscription resource to point to the beta CSV
err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
subscription, err = fetchSubscription(crc, testNamespace, subscriptionName, subscriptionHasInstallPlanChecker)
require.NoError(GinkgoT(), err)
require.NotNil(GinkgoT(), subscription)

subscription.Spec.Channel = betaChannel
subscription, err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).Update(context.TODO(), subscription, metav1.UpdateOptions{})

return err
})
// use server-side apply to update the subscription to point to the beta channel
Eventually(Apply(subscription, func(s *operatorsv1alpha1.Subscription) error {
s.Spec.Channel = betaChannel
return nil
})).Should(Succeed())
ctx.Ctx().Logf("updated subscription to point to beta channel")

// Wait for subscription to have a new installplan
subscription, err = fetchSubscription(crc, testNamespace, subscriptionName, subscriptionHasInstallPlanDifferentChecker(fetchedInstallPlan.GetName()))
Expand Down Expand Up @@ -1011,13 +1025,31 @@ var _ = Describe("Install Plan", func() {
_, err = fetchCatalogSourceOnStatus(crc, mainCatalogSourceName, testNamespace, catalogSourceRegistryPodSynced)
require.NoError(GinkgoT(), err)

// Update the subscription resource to point to the beta CSV
// Update the subscription resource to point to the beta CSV - first delete existing subscription
err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(context.TODO(), *metav1.NewDeleteOptions(0), metav1.ListOptions{})
require.NoError(GinkgoT(), err)

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subscriptionName, metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// Delete orphaned csv
require.NoError(GinkgoT(), crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), mainStableCSV.GetName(), metav1.DeleteOptions{}))

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), mainStableCSV.GetName(), metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// existing cleanup should remove this
createSubscriptionForCatalog(crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, betaChannel, "", operatorsv1alpha1.ApprovalAutomatic)

Expand Down Expand Up @@ -1065,13 +1097,31 @@ var _ = Describe("Install Plan", func() {
_, err = fetchCatalogSourceOnStatus(crc, mainCatalogSourceName, testNamespace, catalogSourceRegistryPodSynced)
require.NoError(GinkgoT(), err)

// Update the subscription resource to point to the beta CSV
// Update the subscription resource to point to the delta CSV - first delete existing subscription
err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(context.TODO(), *metav1.NewDeleteOptions(0), metav1.ListOptions{})
require.NoError(GinkgoT(), err)

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subscriptionName, metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// Delete orphaned csv
require.NoError(GinkgoT(), crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(context.TODO(), mainBetaCSV.GetName(), metav1.DeleteOptions{}))

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), mainBetaCSV.GetName(), metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// existing cleanup should remove this
createSubscriptionForCatalog(crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, deltaChannel, "", operatorsv1alpha1.ApprovalAutomatic)

Expand Down Expand Up @@ -1826,11 +1876,23 @@ var _ = Describe("Install Plan", func() {
require.NoError(GinkgoT(), err)

updateInternalCatalog(GinkgoT(), c, crc, mainCatalogName, testNamespace, []apiextensions.CustomResourceDefinition{updatedCRD}, []operatorsv1alpha1.ClusterServiceVersion{mainCSV}, mainManifests)
// Attempt to get the catalog source before creating install plan(s)
_, err = fetchCatalogSourceOnStatus(crc, mainCatalogName, testNamespace, catalogSourceRegistryPodSynced)
require.NoError(GinkgoT(), err)

// Update the subscription resource
err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(context.TODO(), *metav1.NewDeleteOptions(0), metav1.ListOptions{})
require.NoError(GinkgoT(), err)

// wait for eventual deletion
Eventually(func() error {
_, err := crc.OperatorsV1alpha1().Subscriptions(testNamespace).Get(context.TODO(), subscriptionName, metav1.GetOptions{})
if k8serrors.IsNotFound(err) {
return nil
}
return err
}).Should(Succeed())

// existing cleanup should remove this
subscriptionName = genName("sub-nginx-update-after-")
subscriptionCleanup := createSubscriptionForCatalog(crc, testNamespace, subscriptionName, mainCatalogName, mainPackageName, stableChannel, "", operatorsv1alpha1.ApprovalAutomatic)
Expand Down