Use 'envtest.WaitForCRDs' (#1730)

This removes 'testutils.WaitForCRDs' in favor of 'envtest.WaitForCRDs' as this function will be removed from kuttl in a future release.

Signed-off-by: Jan Schlicht <jan@d2iq.com>

pkg/kudoctl/cmd/init_integration_test.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	testutils "github.com/kudobuilder/kuttl/pkg/test/utils"
 	"github.com/spf13/afero"
@@ -23,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/yaml"
 
 	"github.com/kudobuilder/kudo/pkg/kudoctl/clog"
@@ -130,7 +132,10 @@ func TestIntegInitForCRDs(t *testing.T) {
 	err = cmd.run()
 	assert.NoError(t, err)
 	// WaitForCRDs to be created... the init cmd did NOT wait
-	assert.NoError(t, testutils.WaitForCRDs(testenv.DiscoveryClient, crds))
+	assert.NoError(t, envtest.WaitForCRDs(testenv.Config, crds, envtest.CRDInstallOptions{
+		PollInterval: 100 * time.Millisecond,
+		MaxTime:      10 * time.Second,
+	}))
 	defer func() {
 		assert.NoError(t, deleteObjects(crds, testClient))
 	}()
@@ -196,7 +201,10 @@ func TestIntegInitWithNameSpace(t *testing.T) {
 	}()
 
 	// WaitForCRDs to be created... the init cmd did NOT wait
-	assert.NoError(t, testutils.WaitForCRDs(testenv.DiscoveryClient, crds))
+	assert.NoError(t, envtest.WaitForCRDs(testenv.Config, crds, envtest.CRDInstallOptions{
+		PollInterval: 100 * time.Millisecond,
+		MaxTime:      10 * time.Second,
+	}))
 
 	// make sure that the controller lives in the correct namespace
 	kclient = getKubeClient(t)
@@ -344,7 +352,10 @@ func TestInitWithServiceAccount(t *testing.T) {
 				}()
 
 				// WaitForCRDs to be created... the init cmd did NOT wait
-				assert.NoError(t, testutils.WaitForCRDs(testenv.DiscoveryClient, crds))
+				assert.NoError(t, envtest.WaitForCRDs(testenv.Config, crds, envtest.CRDInstallOptions{
+					PollInterval: 100 * time.Millisecond,
+					MaxTime:      10 * time.Second,
+				}))
 
 				// make sure that the controller lives in the correct namespace
 				kclient = getKubeClient(t)
@@ -398,7 +409,10 @@ func TestReInitFails(t *testing.T) {
 	assert.NoError(t, err)
 
 	// WaitForCRDs to be created... the init cmd did NOT wait
-	assert.NoError(t, testutils.WaitForCRDs(testenv.DiscoveryClient, crds))
+	assert.NoError(t, envtest.WaitForCRDs(testenv.Config, crds, envtest.CRDInstallOptions{
+		PollInterval: 100 * time.Millisecond,
+		MaxTime:      10 * time.Second,
+	}))
 	defer func() {
 		assert.NoError(t, deleteObjects(crds, testClient))
 	}()