OPRUN-4054: [OTE] add catalog tests from openshift/origin #419
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package helpers | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| //nolint:staticcheck // ST1001: dot-imports for readability | ||
| . "github.com/onsi/ginkgo/v2" | ||
| //nolint:staticcheck // ST1001: dot-imports for readability | ||
| . "github.com/onsi/gomega" | ||
|
|
||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| olmv1 "github.com/operator-framework/operator-controller/api/v1" | ||
|
|
||
| "github/operator-framework-operator-controller/openshift/tests-extension/pkg/env" | ||
| ) | ||
|
|
||
| // CreateClusterCatalog creates a ClusterCatalog with the specified name and image reference | ||
| // Returns a cleanup function to delete the catalog after use. | ||
| func CreateClusterCatalog(ctx context.Context, name, imageRef string) (func(), error) { | ||
| k8sClient := env.Get().K8sClient | ||
|
|
||
| catalog := &olmv1.ClusterCatalog{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: name, | ||
| }, | ||
| Spec: olmv1.ClusterCatalogSpec{ | ||
| Source: olmv1.CatalogSource{ | ||
| Type: olmv1.SourceTypeImage, | ||
| Image: &olmv1.ImageSource{ | ||
| Ref: imageRef, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| if err := k8sClient.Create(ctx, catalog); err != nil { | ||
| return nil, fmt.Errorf("failed to create ClusterCatalog: %w", err) | ||
| } | ||
|
|
||
| return func() { | ||
| ctx := context.TODO() | ||
|
There was a problem hiding this comment. should we use context.Background? There was a problem hiding this comment. Maybe we could ensure that all use context.Backrgound right in a follow up There was a problem hiding this comment. According to Gemini: There was a problem hiding this comment. I did not know that as well. |
||
| k := env.Get().K8sClient | ||
| obj := &olmv1.ClusterCatalog{ObjectMeta: metav1.ObjectMeta{Name: name}} | ||
|
|
||
| _ = k.Delete(ctx, obj) | ||
| EnsureCleanupClusterCatalog(ctx, name) | ||
| }, nil | ||
| } | ||
|
|
||
| func EnsureCleanupClusterCatalog(ctx context.Context, name string) { | ||
| k8s := env.Get().K8sClient | ||
| cc := &olmv1.ClusterCatalog{} | ||
| key := client.ObjectKey{Name: name} | ||
|
|
||
| if err := k8s.Get(ctx, key, cc); err != nil { | ||
| if !errors.IsNotFound(err) { | ||
| fmt.Fprintf(GinkgoWriter, "Warning: failed to get ClusterCatalog %q during cleanup: %v\n", name, err) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| By(fmt.Sprintf("deleting lingering ClusterCatalog %q", name)) | ||
| if err := k8s.Delete(ctx, cc); err != nil && !errors.IsNotFound(err) { | ||
| fmt.Fprintf(GinkgoWriter, "Warning: failed to delete ClusterCatalog %q: %v\n", name, err) | ||
| } | ||
|
|
||
| Eventually(func() bool { | ||
| err := k8s.Get(ctx, key, &olmv1.ClusterCatalog{}) | ||
| return errors.IsNotFound(err) | ||
| }).WithTimeout(3*time.Minute).WithPolling(2*time.Second). | ||
| Should(BeTrue(), "ClusterCatalog %q failed to delete", name) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same name: https://github.com/openshift/origin/blob/7e8f07d709c533890f1c2f29fddea27fe4acffae/test/extended/util/annotate/generated/zz_generated.annotations.go#L1994