Wrap up e2e tests by leaving a todo

Signed-off-by: Hasan Turken <[email protected]>
crossplane-contrib · Jul 2, 2024 · a1a9349 · a1a9349
1 parent db2a37c
commit a1a9349
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -89,6 +89,9 @@ CROSSPLANE_NAMESPACE = crossplane-system
 -include build/makelib/local.xpkg.mk
 -include build/makelib/controlplane.mk
 
+# TODO(turkenh): Add "examples/object/object-ssa-owner.yaml" to the list to test the SSA functionality as part of the e2e tests.
+# The test is disabled for now because uptest clears the package cache when the provider restarted with the SSA flag.
+# Enable after https://github.com/crossplane/uptest/issues/17 is fixed.
 UPTEST_EXAMPLE_LIST ?= "examples/object/object.yaml,examples/object/object-watching.yaml"
 uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
 	@$(INFO) running automated tests

diff --git a/examples/object/object-ssa-labeler.yaml b/examples/object/object-ssa-labeler.yaml
@@ -4,10 +4,6 @@ apiVersion: kubernetes.crossplane.io/v1alpha2
 kind: Object
 metadata:
   name: sample-service-labeler
-  annotations:
-    # Note(turkenh): Import restarts Crossplane pod losing the cached provider package
-    # hence preventing changes being redeployed with modified deployment runtime config.
-    uptest.upbound.io/disable-import: "true"
 spec:
   # Note: This resource will only patch/update the manifest below.
   # It will not delete or create the resource.

diff --git a/examples/object/object-ssa-owner.yaml b/examples/object/object-ssa-owner.yaml
@@ -8,9 +8,6 @@ metadata:
     uptest.upbound.io/pre-assert-hook: testhooks/enable-ssa.sh
     uptest.upbound.io/post-assert-hook: testhooks/validate-ssa.sh
     uptest.upbound.io/timeout: "60"
-    # Note(turkenh): Import restarts Crossplane pod losing the cached provider package
-    # hence preventing changes being redeployed with modified deployment runtime config.
-    uptest.upbound.io/disable-import: "true"
 spec:
   forProvider:
     manifest:

diff --git a/examples/object/object-watching.yaml b/examples/object/object-watching.yaml
@@ -7,9 +7,6 @@ metadata:
   annotations:
     uptest.upbound.io/post-assert-hook: testhooks/validate-watching.sh
     uptest.upbound.io/timeout: "60"
-    # Note(turkenh): Import restarts Crossplane pod losing the cached provider package
-    # hence preventing changes being redeployed with modified deployment runtime config.
-    uptest.upbound.io/disable-import: "true"
 spec:
   # Watch for changes to the Namespace object.
   # Watching resources is an alpha feature and needs to be enabled with --enable-watches

diff --git a/examples/object/object.yaml b/examples/object/object.yaml
@@ -4,9 +4,6 @@ metadata:
   name: sample-namespace
   annotations:
     uptest.upbound.io/timeout: "60"
-    # Note(turkenh): Import restarts Crossplane pod losing the cached provider package
-    # hence preventing changes being redeployed with modified deployment runtime config.
-    uptest.upbound.io/disable-import: "true"
 spec:
   # Watch for changes to the Namespace object.
   # Watching resources is an alpha feature and needs to be enabled with --enable-watches

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.3
 require (
 	github.com/Azure/kubelogin v0.1.1
 	github.com/alecthomas/kingpin/v2 v2.4.0
-	github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240509182037-b31be7747c60
+	github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240513123822-e50f51abfed2
 	github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0

diff --git a/go.sum b/go.sum
@@ -39,8 +39,8 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240509182037-b31be7747c60 h1:subdCU8vHUDkaQAYBKKddCT2HpEK4A9fFEJ3nhGoTBc=
-github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240509182037-b31be7747c60/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc=
+github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240513123822-e50f51abfed2 h1:/BYZb3VUwP05YEf6H9WMWe0yxMMrblhLMHO2gTc6tLY=
+github.com/crossplane/crossplane-runtime v1.17.0-rc.0.0.20240513123822-e50f51abfed2/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc=
 github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21 h1:8wb7/zCbVPkeX68WbVESWJmSWQE5SZKzz0g9X4FlXRw=
 github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21/go.mod h1:cN0Y7PFGQMM8mcagXVCbeQoKtipmFWQTPZYyziCPBUI=
 github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE=