Skip to content

Commit 03cb76e

Browse files
committed
test: TestUpgradeDependencyVersion should use its own unique configuration packages
Previously, this e2e test was using a configuration package manually built from another test, which made updating the independent logic in this test more difficult. Now this test uses its own package from xpkg.crossplane.io/crossplane/e2e-upgrade-dependency-version. The overall logic and test cases of the test have not changed. Signed-off-by: Jared Watts <[email protected]>
1 parent d23ad92 commit 03cb76e

File tree

9 files changed

+39
-31
lines changed

9 files changed

+39
-31
lines changed

test/e2e/manifests/pkg/dependency-upgrade/version/configuration-initial.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: configuration-depends-on-version
55
spec:
66
# NOTE(ezgidemirel): This package is manually built and pushed to the registry.
7-
package: xpkg.upbound.io/crossplane/e2e-depends-on-provider-nop:v0.2.0
7+
package: xpkg.crossplane.io/crossplane/e2e-upgrade-dependency-version:v0.3.0

test/e2e/manifests/pkg/dependency-upgrade/version/configuration-updated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: configuration-depends-on-version
55
spec:
66
# NOTE(ezgidemirel): This package is manually built and pushed to the registry.
7-
package: xpkg.upbound.io/crossplane/e2e-depends-on-provider-nop:v0.2.1
7+
package: xpkg.crossplane.io/crossplane/e2e-upgrade-dependency-version:v0.3.1

test/e2e/manifests/pkg/dependency-upgrade/version/package/crossplane-initial.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/e2e/manifests/pkg/dependency-upgrade/version/package/crossplane-updated.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This is the package metadata for the Configuration installed by
2+
# configuration.yaml.
3+
#
4+
# This package is manually built and pushed to
5+
# ghcr.io/crossplane/e2e-upgrade-dependency-version, with something like:
6+
# ❯ export CR_PAT=<token>
7+
# ❯ echo $CR_PAT | docker login ghcr.io -u <user> --password-stdin
8+
# ❯ crossplane xpkg build -o e2e-upgrade-dependency-version.xpkg
9+
# ❯ crossplane xpkg push -f e2e-upgrade-dependency-version.xpkg ghcr.io/crossplane/e2e-upgrade-dependency-version:v0.3.0
10+
apiVersion: meta.pkg.crossplane.io/v1
11+
kind: Configuration
12+
metadata:
13+
name: e2e-upgrade-dependency-version
14+
spec:
15+
dependsOn:
16+
- provider: xpkg.upbound.io/crossplane-contrib/provider-nop
17+
version: =v0.3.0
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This is the package metadata for the Configuration installed by
2+
# configuration-updated.yaml.
3+
#
4+
# This package is manually built and pushed to
5+
# ghcr.io/crossplane/e2e-upgrade-dependency-version, with something like:
6+
# ❯ export CR_PAT=<token>
7+
# ❯ echo $CR_PAT | docker login ghcr.io -u <user> --password-stdin
8+
# ❯ crossplane xpkg build -o e2e-upgrade-dependency-version.xpkg
9+
# ❯ crossplane xpkg push -f e2e-upgrade-dependency-version.xpkg ghcr.io/crossplane/e2e-upgrade-dependency-version:v0.3.1
10+
apiVersion: meta.pkg.crossplane.io/v1
11+
kind: Configuration
12+
metadata:
13+
name: e2e-upgrade-dependency-version
14+
spec:
15+
dependsOn:
16+
- provider: xpkg.upbound.io/crossplane-contrib/provider-nop
17+
version: v0.3.1

test/e2e/manifests/pkg/dependency-upgrade/version/provider-revision.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
apiVersion: pkg.crossplane.io/v1
44
kind: ProviderRevision
55
metadata:
6-
name: crossplane-contrib-provider-nop-ecc25c121431
6+
name: crossplane-contrib-provider-nop-761d51fed128
77
spec: {}

test/e2e/manifests/pkg/dependency-upgrade/version/provider.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: Provider
33
metadata:
44
name: crossplane-contrib-provider-nop
55
spec:
6-
package: xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.0
6+
package: xpkg.upbound.io/crossplane-contrib/provider-nop:v0.3.0

test/e2e/pkg_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func TestUpgradeDependencyVersion(t *testing.T) {
326326
Assess("UpdateConfiguration",
327327
funcs.ApplyResources(FieldManager, manifests, "configuration-updated.yaml")).
328328
Assess("ProviderUpgradedToNewVersionAndHealthy", funcs.AllOf(
329-
funcs.ResourceHasFieldValueWithin(2*time.Minute, &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-contrib-provider-nop"}}, "spec.package", "xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.1"),
329+
funcs.ResourceHasFieldValueWithin(2*time.Minute, &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-contrib-provider-nop"}}, "spec.package", "xpkg.upbound.io/crossplane-contrib/provider-nop:v0.3.1"),
330330
funcs.ResourcesHaveConditionWithin(2*time.Minute, manifests, "provider.yaml", pkgv1.Healthy(), pkgv1.Active()))).
331331
Assess("ConfigurationIsStillHealthy",
332332
funcs.ResourcesHaveConditionWithin(2*time.Minute, manifests, "configuration-updated.yaml", pkgv1.Healthy(), pkgv1.Active())).

0 commit comments

Comments
 (0)