integration tests fixed

Signed-off-by: Mattia Lavacca <[email protected]>
Kong · Aug 24, 2023 · a38a4f1 · a38a4f1
1 parent 55a0de4
commit a38a4f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/internal/controllers/gateway/gateway_controller.go b/internal/controllers/gateway/gateway_controller.go
@@ -628,7 +628,10 @@ func (r *GatewayReconciler) determineServiceForGateway(ctx context.Context, ref
 	var name k8stypes.NamespacedName
 	switch {
 	case ref == r.PublishServiceRef.String():
-		if protocol == gatewayv1beta1.HTTPProtocolType || protocol == gatewayv1beta1.HTTPSProtocolType || protocol == gatewayv1beta1.TCPProtocolType {
+		if protocol == gatewayv1beta1.HTTPProtocolType ||
+			protocol == gatewayv1beta1.HTTPSProtocolType ||
+			protocol == gatewayv1beta1.TCPProtocolType ||
+			r.PublishServiceTLSRef.IsAbsent() && protocol == TLSProtocolType {
 			name = r.PublishServiceRef
 		}
 	case r.PublishServiceUDPRef.IsPresent() && ref == r.PublishServiceUDPRef.MustGet().String():

diff --git a/test/conformance/gateway_conformance_test.go b/test/conformance/gateway_conformance_test.go
@@ -4,6 +4,7 @@ package conformance
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/google/uuid"
@@ -104,9 +105,10 @@ func TestGatewayConformance(t *testing.T) {
 	// This service creation is a temporary solution, intended to be replaced by
 	// https://github.com/Kong/charts/issues/848
 	t.Log("creating tls service for gateway conformance tests")
+	svcNameSuffix, _, _ := strings.Cut(uuid.NewString(), "-")
 	tlsService := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "tls-proxy-" + uuid.NewString(),
+			Name:      "ingress-controller-kong-tls-proxy-" + svcNameSuffix,
 			Namespace: "kong-system",
 		},
 		Spec: corev1.ServiceSpec{
@@ -179,11 +181,10 @@ func TestGatewayConformance(t *testing.T) {
 		GatewayClassName:           gatewayClass.Name,
 		Debug:                      showDebug,
 		CleanupBaseResources:       shouldCleanup,
+		EnableAllSupportedFeatures: enableAllSupportedFeatures,
 		ExemptFeatures:             exemptFeatures,
 		BaseManifests:              conformanceTestsBaseManifests,
 		SkipTests:                  skippedTests,
-		EnableAllSupportedFeatures: false,
-		SupportedFeatures:          suite.TLSCoreFeatures,
 	})
 	cSuite.Setup(t)
 	// To work with individual tests only, you can disable the normal Run call and construct a slice containing a