use namespace kong for integration tests (#4439)

* use namespace kong for integration tests

* use namespace kong in conformance tests

Author: randmonkey

test/conformance/suite_test.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test"
+	"github.com/kong/kubernetes-ingress-controller/v2/test/consts"
 	"github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv"
 )
 
@@ -63,7 +64,8 @@ func TestMain(m *testing.M) {
 	globalLogger = logger
 
 	// In order to pass conformance tests, the expression router is required.
-	kongBuilder := kong.NewBuilder().WithControllerDisabled().WithProxyAdminServiceTypeLoadBalancer()
+	kongBuilder := kong.NewBuilder().WithControllerDisabled().WithProxyAdminServiceTypeLoadBalancer().
+		WithNamespace(consts.ControllerNamespace)
 	if expressionRoutesEnabled() {
 		kongBuilder = kongBuilder.WithProxyEnvVar("router_flavor", "expressions")
 	}

test/consts/misc.go

@@ -14,5 +14,5 @@ const (
 	IngressClass = "kongtests"
 
 	// ControllerNamespace is the Kubernetes namespace where the controller is deployed.
-	ControllerNamespace = "kong-system"
+	ControllerNamespace = "kong"
 )

test/helpers/certificate/certificate.go

@@ -10,6 +10,8 @@ import (
 	"fmt"
 	"math/big"
 	"time"
+
+	"github.com/kong/kubernetes-ingress-controller/v2/test/consts"
 )
 
 type SelfSignedCeritificateOptions struct {
@@ -104,11 +106,12 @@ func MustGenerateSelfSignedCertPEMFormat(decorators ...SelfSignedCeritificateOpt
 }
 
 var kongSystemServiceCert, kongSystemServiceKey = MustGenerateSelfSignedCertPEMFormat(
-	WithCommonName("*.kong-system.svc"), WithDNSNames("*.kong-system.svc"),
+	WithCommonName(fmt.Sprintf("*.%s.svc", consts.ControllerNamespace)),
+	WithDNSNames(fmt.Sprintf("*.%s.svc", consts.ControllerNamespace)),
 )
 
 // GetKongSystemSelfSignedCerts returns the self-signed certificate and key
-// with CN=*.kong-system.svc and subjectAltName=DNS:*.kong-system.svc.
+// with CN=*.<controllerNamespace>.svc and subjectAltName=DNS:*.<controllerNamespace>.svc.
 func GetKongSystemSelfSignedCerts() (cert []byte, key []byte) {
 	return kongSystemServiceCert, kongSystemServiceKey
 }

test/integration/gateway_test.go

@@ -4,7 +4,9 @@ package integration
 
 import (
 	"context"
+	"fmt"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
@@ -64,7 +66,13 @@ func TestUnmanagedGatewayBasics(t *testing.T) {
 	require.Eventually(t, func() bool {
 		gw, err = gatewayClient.GatewayV1beta1().Gateways(ns.Name).Get(ctx, defaultGatewayName, metav1.GetOptions{})
 		require.NoError(t, err)
-		return gw.Annotations[annotations.GatewayClassUnmanagedAnnotation] == "kong-system/ingress-controller-kong-proxy,kong-system/ingress-controller-kong-udp-proxy"
+		return gw.Annotations[annotations.GatewayClassUnmanagedAnnotation] == strings.Join(
+			[]string{
+				fmt.Sprintf("%s/%s", pubsvc.Namespace, pubsvc.Name),
+				fmt.Sprintf("%s/%s", pubsvcUDP.Namespace, pubsvcUDP.Name),
+			},
+			",",
+		)
 	}, gatewayUpdateWaitTime, time.Second)
 
 	t.Log("verifying that the gateway address is populated from the publish service")

test/internal/helpers/ktf.go

@@ -13,7 +13,7 @@ import (
 // GenerateKongBuilder returns a Kong KTF addon builder, a string slice
 // of controller arguments needed to interact with the addon and an error.
 func GenerateKongBuilder(_ context.Context) (*kong.Builder, []string, error) {
-	kongbuilder := kong.NewBuilder()
+	kongbuilder := kong.NewBuilder().WithNamespace(consts.ControllerNamespace)
 	extraControllerArgs := []string{}
 	if testenv.KongEnterpriseEnabled() {
 		licenseJSON, err := kong.GetLicenseJSONFromEnv()