🌱 fix TestClusterExtensionInstallReResolvesWhenNewCataloge2e test #1008
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 |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import ( | |
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-containerregistry/pkg/crane" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "gopkg.in/yaml.v2" | ||
|
|
@@ -94,7 +95,7 @@ func TestClusterExtensionInstallRegistry(t *testing.T) { | |
| assert.Equal(ct, metav1.ConditionTrue, cond.Status) | ||
| assert.Equal(ct, ocv1alpha1.ReasonSuccess, cond.Reason) | ||
| assert.Contains(ct, cond.Message, "resolved to") | ||
| assert.Equal(ct, &ocv1alpha1.BundleMetadata{Name: "prometheus-operator.1.2.0", Version: "1.2.0"}, clusterExtension.Status.ResolvedBundle) | ||
| }, pollDuration, pollInterval) | ||
|
|
||
| t.Log("By eventually reporting a successful unpacked") | ||
|
|
@@ -123,75 +124,6 @@ func TestClusterExtensionInstallRegistry(t *testing.T) { | |
| }, pollDuration, pollInterval) | ||
| } | ||
|
|
||
| func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) { | ||
| t.Log("When a cluster extension is installed from a catalog") | ||
| t.Log("When resolving upgrade edges") | ||
|
|
@@ -337,6 +269,84 @@ func TestClusterExtensionInstallSuccessorVersion(t *testing.T) { | |
| }, pollDuration, pollInterval) | ||
| } | ||
|
|
||
| func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) { | ||
|
There was a problem hiding this comment. @joelanford I wonder if we should rethink the e2es to flow from each other some how and where possible. What I mean is, do we want (just about) every test to start with install a CE then wait? I'm wondering if instead we could 1) install something 2) upgrade that something 3) swap the catalog 4) bring it down, etc. I want to avoid as much as possible the 2h e2e test runtime (if possible). I know there's some pros and cons here. So, just wondering if there's another strategy that we can adopt that keep the resource usage lower while still giving us a strong signal. |
||
| t.Log("When a cluster extension is installed from a catalog") | ||
| t.Log("It resolves again when a new catalog is available") | ||
|
|
||
| // Tag the image with the new tag | ||
| var err error | ||
| v1Image := fmt.Sprintf("%s/%s", os.Getenv("CLUSTER_REGISTRY_HOST"), os.Getenv("E2E_TEST_CATALOG_V1")) | ||
| err = crane.Tag(v1Image, latestImageTag, crane.Insecure) | ||
| require.NoError(t, err) | ||
|
|
||
| // create a test-catalog with latest image tag | ||
| latestCatalogImage := fmt.Sprintf("%s/e2e/test-catalog:latest", os.Getenv("LOCAL_REGISTRY_HOST")) | ||
| extensionCatalog, err := createTestCatalog(context.Background(), testCatalogName, latestCatalogImage) | ||
| require.NoError(t, err) | ||
| clusterExtensionName := fmt.Sprintf("clusterextension-%s", rand.String(8)) | ||
| clusterExtension := &ocv1alpha1.ClusterExtension{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: clusterExtensionName, | ||
| }, | ||
| } | ||
| defer testCleanup(t, extensionCatalog, clusterExtension) | ||
| defer getArtifactsOutput(t) | ||
|
|
||
| clusterExtension.Spec = ocv1alpha1.ClusterExtensionSpec{ | ||
| PackageName: "prometheus", | ||
| InstallNamespace: "default", | ||
| ServiceAccount: ocv1alpha1.ServiceAccountReference{ | ||
| Name: "default", | ||
| }, | ||
| } | ||
| t.Log("It resolves the specified package with correct bundle path") | ||
| t.Log("By creating the ClusterExtension resource") | ||
| require.NoError(t, c.Create(context.Background(), clusterExtension)) | ||
|
|
||
| t.Log("By reporting a successful resolution and bundle path") | ||
| require.EventuallyWithT(t, func(ct *assert.CollectT) { | ||
| assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension)) | ||
| assert.Len(ct, clusterExtension.Status.Conditions, len(conditionsets.ConditionTypes)) | ||
| cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved) | ||
| if !assert.NotNil(ct, cond) { | ||
| return | ||
| } | ||
| assert.Equal(ct, metav1.ConditionTrue, cond.Status) | ||
| assert.Equal(ct, ocv1alpha1.ReasonSuccess, cond.Reason) | ||
| assert.Contains(ct, cond.Message, "resolved to") | ||
| assert.Equal(ct, &ocv1alpha1.BundleMetadata{Name: "prometheus-operator.1.2.0", Version: "1.2.0"}, clusterExtension.Status.ResolvedBundle) | ||
| }, pollDuration, pollInterval) | ||
|
|
||
| // update tag on test-catalog image with v2 image | ||
| t.Log("By updating the catalog tag to point to the v2 catalog") | ||
| v2Image := fmt.Sprintf("%s/%s", os.Getenv("CLUSTER_REGISTRY_HOST"), os.Getenv("E2E_TEST_CATALOG_V2")) | ||
| err = crane.Tag(v2Image, latestImageTag, crane.Insecure) | ||
| require.NoError(t, err) | ||
| require.EventuallyWithT(t, func(ct *assert.CollectT) { | ||
| assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.Name}, extensionCatalog)) | ||
| cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, catalogd.TypeUnpacked) | ||
| if !assert.NotNil(ct, cond) { | ||
| return | ||
| } | ||
| assert.Equal(ct, metav1.ConditionTrue, cond.Status) | ||
| assert.Equal(ct, catalogd.ReasonUnpackSuccessful, cond.Reason) | ||
| }, pollDuration, pollInterval) | ||
|
|
||
| t.Log("By eventually reporting a successful resolution and bundle path") | ||
| require.EventuallyWithT(t, func(ct *assert.CollectT) { | ||
| assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension)) | ||
| assert.Len(ct, clusterExtension.Status.Conditions, len(conditionsets.ConditionTypes)) | ||
| cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved) | ||
| if !assert.NotNil(ct, cond) { | ||
| return | ||
| } | ||
| assert.Equal(ct, metav1.ConditionTrue, cond.Status) | ||
| assert.Equal(ct, ocv1alpha1.ReasonSuccess, cond.Reason) | ||
| assert.Contains(ct, cond.Message, "resolved to") | ||
| assert.Equal(ct, &ocv1alpha1.BundleMetadata{Name: "prometheus-operator.2.0.0", Version: "2.0.0"}, clusterExtension.Status.ResolvedBundle) | ||
| }, pollDuration, pollInterval) | ||
| } | ||
|
|
||
| // getArtifactsOutput gets all the artifacts from the test run and saves them to the artifact path. | ||
| // Currently it saves: | ||
| // - clusterextensions | ||
|
|
||
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
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
File renamed without changes.
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,6 @@ | ||
| FROM scratch | ||
| ADD test-catalog-v2 /configs | ||
|
|
||
| # Set DC-specific label for the location of the DC root directory | ||
| # in the image | ||
| LABEL operators.operatorframework.io.index.configs.v1=/configs |
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,2 @@ | ||
| /expected_all.json | ||
| ..* |
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,21 @@ | ||
| --- | ||
| schema: olm.package | ||
| name: prometheus | ||
| defaultChannel: beta | ||
| --- | ||
| schema: olm.channel | ||
| name: beta | ||
| package: prometheus | ||
| entries: | ||
| - name: prometheus-operator.2.0.0 | ||
| replaces: prometheus-operator.1.2.0 | ||
| --- | ||
| schema: olm.bundle | ||
| name: prometheus-operator.2.0.0 | ||
| package: prometheus | ||
| image: docker-registry.operator-controller-e2e.svc.cluster.local:5000/bundles/registry-v1/prometheus-operator:v2.0.0 | ||
| properties: | ||
| - type: olm.package | ||
| value: | ||
| packageName: prometheus | ||
| version: 2.0.0 |
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.
Not sure what others think, but to me it is more logical to flip these. LOCAL for
localhost, CLUSTER for the service-based name.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.
I wouldn't call
localhosta host, this is theENDPOINTinto the the cluster. It's really theexternalcallable address. Spitballing, because names are hard, but maybeCLUSTER_REGISTRY_INGRESS?I agree the
svc:5000address should be calledCLUSTER.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.
Do we need to address this before merging? Looks like we should...?