tests: deploy knative addon only when necessary

Kong · Jan 3, 2023 · f0e5d83 · f0e5d83
1 parent fd4b1f6
commit f0e5d83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/test/integration/knative_test.go b/test/integration/knative_test.go
@@ -43,6 +43,16 @@ func TestKnativeIngress(t *testing.T) {
 	}
 
 	t.Parallel()
+
+	knativeAddon := knative.NewBuilder().Build()
+	t.Log("deploying knative addon")
+	require.NoError(t, env.Cluster().DeployAddon(ctx, knativeAddon))
+	t.Log("waiting for addon to become ready")
+	require.NoError(t, <-env.WaitForReady(ctx))
+	_, ready, err := knativeAddon.Ready(ctx, env.Cluster())
+	require.NoError(t, err)
+	require.True(t, ready)
+
 	ns := namespace(t)
 
 	t.Log("generating a knative clientset")

diff --git a/test/integration/suite_test.go b/test/integration/suite_test.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/blang/semver/v4"
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters"
-	"github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/knative"
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/kong"
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/metallb"
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters/types/gke"
@@ -165,12 +164,6 @@ func TestMain(m *testing.M) {
 	exitOnErr(ctx, err)
 	clusterVersion, err = env.Cluster().Version()
 	exitOnErr(ctx, err)
-	if clusterVersion.GE(knativeMinKubernetesVersion) {
-		fmt.Println("INFO: deploying knative addon")
-		knativeBuilder := knative.NewBuilder()
-		knativeAddon := knativeBuilder.Build()
-		exitOnErr(ctx, env.Cluster().DeployAddon(ctx, knativeAddon))
-	}
 
 	fmt.Printf("INFO: waiting for cluster %s and all addons to become ready\n", env.Cluster().Name())
 	exitOnErr(ctx, <-env.WaitForReady(ctx))