diff --git a/conformance/tests/gateway-secret-missing-referenced-secret.go b/conformance/tests/gateway-secret-missing-referenced-secret.go index 919a21484d..53d17b3244 100644 --- a/conformance/tests/gateway-secret-missing-referenced-secret.go +++ b/conformance/tests/gateway-secret-missing-referenced-secret.go @@ -33,7 +33,7 @@ func init() { var GatewaySecretMissingReferencedSecret = suite.ConformanceTest{ ShortName: "GatewaySecretMissingReferencedSecret", - Description: "A Gateway should fail to become ready if the Gateway has a certificateRef for a nonexistent Secret", + Description: "A Gateway should fail to become programmed if the Gateway has a certificateRef for a nonexistent Secret", Manifests: []string{"tests/gateway-secret-missing-referenced-secret.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { gwNN := types.NamespacedName{Name: "gateway-secret-missing-referenced-secret", Namespace: "gateway-conformance-infra"} diff --git a/conformance/tests/gateway-secret-reference-grant-all-in-namespace.go b/conformance/tests/gateway-secret-reference-grant-all-in-namespace.go index 3f1dffbbff..221ad10317 100644 --- a/conformance/tests/gateway-secret-reference-grant-all-in-namespace.go +++ b/conformance/tests/gateway-secret-reference-grant-all-in-namespace.go @@ -33,13 +33,13 @@ func init() { var GatewaySecretReferenceGrantAllInNamespace = suite.ConformanceTest{ ShortName: "GatewaySecretReferenceGrantAllInNamespace", - Description: "A Gateway in the gateway-conformance-infra namespace should become ready if the Gateway has a certificateRef for a Secret in the gateway-conformance-web-backend namespace and a ReferenceGrant granting permission to all Secrets in the namespace exists", + Description: "A Gateway in the gateway-conformance-infra namespace should become programmed if the Gateway has a certificateRef for a Secret in the gateway-conformance-web-backend namespace and a ReferenceGrant granting permission to all Secrets in the namespace exists", Exemptions: []suite.ExemptFeature{suite.ExemptReferenceGrant}, Manifests: []string{"tests/gateway-secret-reference-grant-all-in-namespace.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { gwNN := types.NamespacedName{Name: "gateway-secret-reference-grant", Namespace: "gateway-conformance-infra"} - t.Run("Gateway listener should have a true ResolvedRefs condition and a true Ready condition", func(t *testing.T) { + t.Run("Gateway listener should have a true ResolvedRefs condition and a true Programmed condition", func(t *testing.T) { listeners := []v1beta1.ListenerStatus{{ Name: v1beta1.SectionName("https"), SupportedKinds: []v1beta1.RouteGroupKind{{ @@ -48,9 +48,9 @@ var GatewaySecretReferenceGrantAllInNamespace = suite.ConformanceTest{ }}, Conditions: []metav1.Condition{ { - Type: string(v1beta1.ListenerConditionReady), + Type: string(v1beta1.ListenerConditionProgrammed), Status: metav1.ConditionTrue, - Reason: string(v1beta1.ListenerReasonReady), + Reason: string(v1beta1.ListenerConditionProgrammed), }, }, }} diff --git a/conformance/tests/gateway-secret-reference-grant-specific.go b/conformance/tests/gateway-secret-reference-grant-specific.go index 5bae62b923..ff6aab51b0 100644 --- a/conformance/tests/gateway-secret-reference-grant-specific.go +++ b/conformance/tests/gateway-secret-reference-grant-specific.go @@ -33,13 +33,13 @@ func init() { var GatewaySecretReferenceGrantSpecific = suite.ConformanceTest{ ShortName: "GatewaySecretReferenceGrantSpecific", - Description: "A Gateway in the gateway-conformance-infra namespace should become ready if the Gateway has a certificateRef for a Secret in the gateway-conformance-web-backend namespace and a ReferenceGrant granting permission to the specific Secret exists", + Description: "A Gateway in the gateway-conformance-infra namespace should become programmed if the Gateway has a certificateRef for a Secret in the gateway-conformance-web-backend namespace and a ReferenceGrant granting permission to the specific Secret exists", Exemptions: []suite.ExemptFeature{suite.ExemptReferenceGrant}, Manifests: []string{"tests/gateway-secret-reference-grant-specific.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { gwNN := types.NamespacedName{Name: "gateway-secret-reference-grant", Namespace: "gateway-conformance-infra"} - t.Run("Gateway listener should have a true ResolvedRefs condition and a true Ready condition", func(t *testing.T) { + t.Run("Gateway listener should have a true ResolvedRefs condition and a true Programmed condition", func(t *testing.T) { listeners := []v1beta1.ListenerStatus{{ Name: v1beta1.SectionName("https"), SupportedKinds: []v1beta1.RouteGroupKind{{ @@ -48,9 +48,9 @@ var GatewaySecretReferenceGrantSpecific = suite.ConformanceTest{ }}, Conditions: []metav1.Condition{ { - Type: string(v1beta1.ListenerConditionReady), + Type: string(v1beta1.ListenerConditionProgrammed), Status: metav1.ConditionTrue, - Reason: string(v1beta1.ListenerReasonReady), + Reason: string(v1beta1.ListenerReasonProgrammed), }, }, }}