Skip to content

Commit 4cc97eb

Browse files
committed
chore(tests) check new default Gateway condition
Updated as part of kubernetes-sigs/gateway-api#1888
1 parent b29b075 commit 4cc97eb

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

test/integration/gateway_test.go

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,8 @@ func TestUnmanagedGatewayControllerSupport(t *testing.T) {
385385
for timeout.After(time.Now()) {
386386
unsupportedGateway, err = gatewayClient.GatewayV1beta1().Gateways(ns.Name).Get(ctx, unsupportedGateway.Name, metav1.GetOptions{})
387387
require.NoError(t, err)
388-
require.Len(t, unsupportedGateway.Status.Conditions, 1)
389-
//lint:ignore SA1019 the default upstream reason is still NotReconciled https://github.com/kubernetes-sigs/gateway-api/pull/1701
390-
//nolint:staticcheck
391-
require.Equal(t, string(gatewayv1beta1.GatewayReasonNotReconciled), unsupportedGateway.Status.Conditions[0].Reason)
388+
require.Len(t, unsupportedGateway.Status.Conditions, 2)
389+
require.Equal(t, string(gatewayv1beta1.GatewayReasonPending), unsupportedGateway.Status.Conditions[0].Reason)
392390
}
393391
}
394392

@@ -415,10 +413,8 @@ func TestUnmanagedGatewayClass(t *testing.T) {
415413
for timeout.After(time.Now()) {
416414
gateway, err = gatewayClient.GatewayV1beta1().Gateways(ns.Name).Get(ctx, gateway.Name, metav1.GetOptions{})
417415
require.NoError(t, err)
418-
require.Len(t, gateway.Status.Conditions, 1)
419-
//lint:ignore SA1019 the default upstream reason is still NotReconciled https://github.com/kubernetes-sigs/gateway-api/pull/1701
420-
//nolint:staticcheck
421-
require.Equal(t, string(gatewayv1beta1.GatewayReasonNotReconciled), gateway.Status.Conditions[0].Reason)
416+
require.Len(t, gateway.Status.Conditions, 2)
417+
require.Equal(t, string(gatewayv1beta1.GatewayReasonPending), gateway.Status.Conditions[0].Reason)
422418
}
423419

424420
t.Log("deploying the missing gatewayclass to the test cluster")
@@ -462,10 +458,8 @@ func TestManagedGatewayClass(t *testing.T) {
462458
for timeout.After(time.Now()) {
463459
gateway, err = gatewayClient.GatewayV1beta1().Gateways(ns.Name).Get(ctx, gateway.Name, metav1.GetOptions{})
464460
require.NoError(t, err)
465-
require.Len(t, gateway.Status.Conditions, 1)
466-
//lint:ignore SA1019 the default upstream reason is still NotReconciled https://github.com/kubernetes-sigs/gateway-api/pull/1701
467-
//nolint:staticcheck
468-
require.Equal(t, string(gatewayv1beta1.GatewayReasonNotReconciled), gateway.Status.Conditions[0].Reason)
461+
require.Len(t, gateway.Status.Conditions, 2)
462+
require.Equal(t, string(gatewayv1beta1.GatewayReasonPending), gateway.Status.Conditions[0].Reason)
469463
}
470464

471465
t.Log("deploying a missing managed gatewayclass to the test cluster")

0 commit comments

Comments
 (0)