fix: CR Resolution 2

Author: EyalPazz

conformance/tests/gateway-optional-address-value.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
@@ -65,9 +64,7 @@ var GatewayOptionalAddressValue = suite.ConformanceTest{
 		err := s.Client.Get(ctx, gwNN, currentGW)
 		require.NoError(t, err, "error getting Gateway: %v", err)
 		t.Logf("verifying that the Gateway %s/%s is accepted", gwNN.Namespace, gwNN.Name)
-		kubernetes.GatewayMustHaveCondition(t, s.Client, s.TimeoutConfig, gwNN, metav1.Condition{
-			Type:   string(v1.GatewayConditionAccepted),
-			Status: metav1.ConditionTrue,
-		})
+		_, err = kubernetes.WaitForGatewayAddress(t, s.Client, s.TimeoutConfig, kubernetes.NewGatewayRef(gwNN, "http"))
+		require.NoError(t, err, "timed out waiting for Gateway address to be assigned")
 	},
 }

conformance/utils/kubernetes/apply.go

@@ -142,13 +142,20 @@ func (a Applier) prepareGateway(t *testing.T, uObj *unstructured.Unstructured) {
 
 	//  This is being done in order to support the injection of implementation-specific address types
 	// into the test suite
-	if len(gwspec.Addresses) > 0 && *gwspec.Addresses[0].Type == "PLACEHOLDER_ADDRESS_TYPE" {
-		addrs := map[string]interface{}{
-			"type": a.AddressType,
+	var addresses []interface{}
+	for _, add := range gwspec.Addresses {
+		if *add.Type == "PLACEHOLDER_ADDRESS_TYPE" {
+			addresses = append(addresses, map[string]interface{}{
+				"type": a.AddressType,
+			},
+			)
+		} else {
+			addresses = append(addresses, add)
 		}
-		err = unstructured.SetNestedSlice(uObj.Object, []interface{}{addrs}, "spec", "addresses")
-		require.NoError(t, err, "could not overlay address type on Gateway %s/%s", ns, name)
 	}
+	err = unstructured.SetNestedSlice(uObj.Object, addresses, "spec", "addresses")
+	fmt.Println(uObj.Object)
+	require.NoError(t, err, "could not overlay address type on Gateway %s/%s", ns, name)
 }
 
 // prepareGatewayClass adjust the spec.controllerName on the resource

conformance/utils/kubernetes/helpers.go

@@ -444,7 +444,7 @@ func WaitForGatewayAddress(t *testing.T, client client.Client, timeoutConfig con
 		port = strconv.FormatInt(int64(listener.Port), 10)
 
 		for _, address := range gw.Status.Addresses {
-			if address.Type != nil && (*address.Type == gatewayv1.IPAddressType || *address.Type == v1alpha2.HostnameAddressType) {
+			if address.Type != nil {
 				ipAddr = address.Value
 				return true, nil
 			}