Merge pull request #4757 from sedefsavas/crs-timeout

🐛 CRS test fix: get ClusterResourceSetBinding with live client

exp/addons/controllers/clusterresourceset_controller_test.go

@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	timeout              = time.Second * 5
+	timeout              = time.Second * 15
 	defaultNamespaceName = "default"
 )
 

exp/addons/controllers/suite_test.go

@@ -21,9 +21,12 @@ import (
 	"os"
 	"testing"
 
+	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/cluster-api/controllers/remote"
+	"sigs.k8s.io/cluster-api/exp/addons/api/v1alpha4"
 	"sigs.k8s.io/cluster-api/internal/envtest"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	// +kubebuilder:scaffold:imports
 )
@@ -35,7 +38,7 @@ var (
 
 func TestMain(m *testing.M) {
 	fmt.Println("Creating new test environment")
-	env = envtest.New()
+	env = envtest.New([]client.Object{&corev1.ConfigMap{}, &corev1.Secret{}, &v1alpha4.ClusterResourceSetBinding{}}...)
 
 	trckr, err := remote.NewClusterCacheTracker(env.Manager, remote.ClusterCacheTrackerOptions{})
 	if err != nil {

internal/envtest/environment.go

@@ -103,7 +103,7 @@ type Environment struct {
 //
 // This function should be called only once for each package you're running tests within,
 // usually the environment is initialized in a suite_test.go file within a `BeforeSuite` ginkgo block.
-func New() *Environment {
+func New(uncachedObjs ...client.Object) *Environment {
 	// Get the root of the current file to use in CRD paths.
 	_, filename, _, _ := goruntime.Caller(0) //nolint
 	root := path.Join(path.Dir(filename), "..", "..")
@@ -134,11 +134,17 @@ func New() *Environment {
 		panic(err)
 	}
 
+	objs := []client.Object{}
+	if len(uncachedObjs) > 0 {
+		objs = append(objs, uncachedObjs...)
+	}
+
 	options := manager.Options{
-		Scheme:             scheme.Scheme,
-		MetricsBindAddress: "0",
-		CertDir:            env.WebhookInstallOptions.LocalServingCertDir,
-		Port:               env.WebhookInstallOptions.LocalServingPort,
+		Scheme:                scheme.Scheme,
+		MetricsBindAddress:    "0",
+		CertDir:               env.WebhookInstallOptions.LocalServingCertDir,
+		Port:                  env.WebhookInstallOptions.LocalServingPort,
+		ClientDisableCacheFor: objs,
 	}
 
 	mgr, err := ctrl.NewManager(env.Config, options)