Skip to content

✨ Fix e2e #843

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

Merged
merged 1 commit into from
May 10, 2024
Merged

✨ Fix e2e #843

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ go-build-local: $(BINARIES)
.PHONY: build-linux go-build-linux
build-linux: build-deps go-build-linux #EXHELP Build manager binary for GOOS=linux and local GOARCH.
go-build-linux: BUILDBIN := bin/linux
go-build-linux: GOOS=linux
go-build-linux: export GOOS=linux
go-build-linux: export GOARCH=amd64
go-build-linux: $(BINARIES)

.PHONY: run
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/operator-framework/catalogd v0.12.0
github.com/operator-framework/helm-operator-plugins v0.2.1
github.com/operator-framework/operator-registry v1.40.0
github.com/operator-framework/rukpak v0.20.1-0.20240506151208-b6c74d40c3e9
github.com/operator-framework/rukpak v0.20.1-0.20240510194410-99faf1c1763f
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,8 @@ github.com/operator-framework/operator-lib v0.12.0 h1:OzpMU5N7mvFgg/uje8FUUeD24A
github.com/operator-framework/operator-lib v0.12.0/go.mod h1:ClpLUI7hctEF7F5DBe/kg041dq/4NLR7XC5tArY7bG4=
github.com/operator-framework/operator-registry v1.40.0 h1:CaYNE4F/jzahpC7UCILItaIHmB5/oE0sS066nK+5Glw=
github.com/operator-framework/operator-registry v1.40.0/go.mod h1:D2YxapkfRDgjqNTO9d3h3v0DeREbV+8utCLG52zrOy4=
github.com/operator-framework/rukpak v0.20.1-0.20240506151208-b6c74d40c3e9 h1:itmEvkRAglIyVIFg7bmL+3G+HAYIrdK4ALEx7Ww1Nkc=
github.com/operator-framework/rukpak v0.20.1-0.20240506151208-b6c74d40c3e9/go.mod h1:WAyS3DXZ19pLg/324PEoudWZmaRlYZ6i4j4NV3/T/mI=
github.com/operator-framework/rukpak v0.20.1-0.20240510194410-99faf1c1763f h1:9oJCWuUJ928v26u6Ny9pM6kLYuzfUT+iqkncbnFNNnQ=
github.com/operator-framework/rukpak v0.20.1-0.20240510194410-99faf1c1763f/go.mod h1:WAyS3DXZ19pLg/324PEoudWZmaRlYZ6i4j4NV3/T/mI=
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
Expand Down
3 changes: 2 additions & 1 deletion internal/controllers/clusterextension_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
if err != nil {
ext.Status.ResolvedBundle = nil
ext.Status.InstalledBundle = nil
setInstalledStatusConditionFailed(&ext.Status.Conditions, fmt.Sprintf("%s:%v", "unable to get resolved bundle version", err), ext.Generation)
setResolvedStatusConditionFailed(&ext.Status.Conditions, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonResolutionFailed, err), ext.GetGeneration())
setInstalledStatusConditionFailed(&ext.Status.Conditions, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonInstallationFailed, err), ext.Generation)
return ctrl.Result{}, err
}

Expand Down
48 changes: 25 additions & 23 deletions test/e2e/cluster_extension_install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
var pollDuration = time.Minute
var pollInterval = time.Second

func testInit(t *testing.T) (*ocv1alpha1.ClusterExtension, string, *catalogd.Catalog) {
func testInit(t *testing.T) (*ocv1alpha1.ClusterExtension, *catalogd.Catalog) {
var err error
extensionCatalog, err := createTestCatalog(context.Background(), testCatalogName, os.Getenv(testCatalogRefEnvVar))
require.NoError(t, err)
Expand All @@ -48,7 +48,7 @@ func testInit(t *testing.T) (*ocv1alpha1.ClusterExtension, string, *catalogd.Cat
Name: clusterExtensionName,
},
}
return clusterExtension, clusterExtensionName, extensionCatalog
return clusterExtension, extensionCatalog
}

func testCleanup(t *testing.T, cat *catalogd.Catalog, clusterExtension *ocv1alpha1.ClusterExtension) {
Expand All @@ -68,7 +68,7 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
t.Log("When a cluster extension is installed from a catalog")
t.Log("When the extension bundle format is registry+v1")

clusterExtension, clusterExtensionName, extensionCatalog := testInit(t)
clusterExtension, extensionCatalog := testInit(t)
defer testCleanup(t, extensionCatalog, clusterExtension)
defer getArtifactsOutput(t)

Expand All @@ -83,7 +83,7 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
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, 6)
assert.Len(ct, clusterExtension.Status.Conditions, 9)
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeResolved)
if !assert.NotNil(ct, cond) {
return
Expand All @@ -94,6 +94,18 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
assert.Equal(ct, &ocv1alpha1.BundleMetadata{Name: "prometheus-operator.2.0.0", Version: "2.0.0"}, clusterExtension.Status.ResolvedBundle)
}, pollDuration, pollInterval)

t.Log("By eventually reporting a successful unpacked")
require.EventuallyWithT(t, func(ct *assert.CollectT) {
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, rukpakv1alpha2.TypeUnpacked)
if !assert.NotNil(ct, cond) {
return
}
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
assert.Equal(ct, rukpakv1alpha2.ReasonUnpackSuccessful, cond.Reason)
assert.Contains(ct, cond.Message, "Successfully unpacked")
}, pollDuration, pollInterval)

t.Log("By eventually installing the package successfully")
require.EventuallyWithT(t, func(ct *assert.CollectT) {
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtension.Name}, clusterExtension))
Expand All @@ -103,29 +115,16 @@ func TestClusterExtensionInstallRegistry(t *testing.T) {
}
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
assert.Equal(ct, ocv1alpha1.ReasonSuccess, cond.Reason)
assert.Contains(ct, cond.Message, "installed from")
assert.Contains(ct, cond.Message, "Instantiated bundle")
assert.NotEmpty(ct, clusterExtension.Status.InstalledBundle)

bd := rukpakv1alpha2.BundleDeployment{}
assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: clusterExtensionName}, &bd))
isUnpackSuccessful := apimeta.FindStatusCondition(bd.Status.Conditions, rukpakv1alpha2.TypeUnpacked)
if !assert.NotNil(ct, isUnpackSuccessful) {
return
}
assert.Equal(ct, rukpakv1alpha2.ReasonUnpackSuccessful, isUnpackSuccessful.Reason)
installed := apimeta.FindStatusCondition(bd.Status.Conditions, rukpakv1alpha2.TypeInstalled)
if !assert.NotNil(ct, installed) {
return
}
assert.Equal(ct, rukpakv1alpha2.ReasonInstallationSucceeded, installed.Reason)
}, pollDuration, pollInterval)
}

func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
t.Log("When a cluster extension is installed from a catalog")
t.Log("It resolves again when a new catalog is available")

clusterExtension, _, extensionCatalog := testInit(t)
clusterExtension, extensionCatalog := testInit(t)
defer testCleanup(t, extensionCatalog, clusterExtension)
defer getArtifactsOutput(t)

Expand Down Expand Up @@ -154,7 +153,7 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
}
assert.Equal(ct, metav1.ConditionFalse, cond.Status)
assert.Equal(ct, ocv1alpha1.ReasonResolutionFailed, cond.Reason)
assert.Equal(ct, fmt.Sprintf("no package %q found", pkgName), cond.Message)
assert.Contains(ct, cond.Message, fmt.Sprintf("no package %q found", pkgName))
}, pollDuration, pollInterval)

t.Log("By creating an ClusterExtension catalog with the desired package")
Expand Down Expand Up @@ -184,10 +183,11 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
}

func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) {
t.Skip("Skipping tests related to upgrades")
t.Log("When a cluster extension is installed from a catalog")
t.Log("When resolving upgrade edges")

clusterExtension, _, extensionCatalog := testInit(t)
clusterExtension, extensionCatalog := testInit(t)
defer testCleanup(t, extensionCatalog, clusterExtension)
defer getArtifactsOutput(t)

Expand Down Expand Up @@ -229,10 +229,11 @@ func TestClusterExtensionBlockInstallNonSuccessorVersion(t *testing.T) {
}

func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
t.Skip("Skipping tests related to upgrades")
t.Log("When a cluster extension is installed from a catalog")
t.Log("When resolving upgrade edges")

clusterExtension, _, extensionCatalog := testInit(t)
clusterExtension, extensionCatalog := testInit(t)
defer testCleanup(t, extensionCatalog, clusterExtension)
defer getArtifactsOutput(t)

Expand Down Expand Up @@ -275,9 +276,10 @@ func TestClusterExtensionForceInstallNonSuccessorVersion(t *testing.T) {
}

func TestClusterExtensionInstallSuccessorVersion(t *testing.T) {
t.Skip("Skipping tests related to upgrades")
t.Log("When a cluster extension is installed from a catalog")
t.Log("When resolving upgrade edges")
clusterExtension, _, extensionCatalog := testInit(t)
clusterExtension, extensionCatalog := testInit(t)
defer testCleanup(t, extensionCatalog, clusterExtension)
defer getArtifactsOutput(t)

Expand Down