Skip to content

Commit dbb8f13

Browse files
committed
fix(translator): separate RefNotPermitted from InvalidCertificateRef handling
Unlike InvalidCertificateRef, RefNotPermitted should not set Accepted:True. Update unit test fixtures to match. Signed-off-by: apkatsikas <apkatsikas@gmail.com>
1 parent 7289c3d commit dbb8f13

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ gateways:
2828
reason: RefNotPermitted
2929
status: "False"
3030
type: ResolvedRefs
31-
- lastTransitionTime: null
32-
message: Listener has been successfully translated
33-
reason: Accepted
34-
status: "True"
35-
type: Accepted
3631
- lastTransitionTime: null
3732
message: Listener is invalid, see other Conditions for details.
3833
reason: Invalid

internal/gatewayapi/testdata/listenerset-https-tls-misuses-gateway-namespace.out.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ listenerSets:
134134
status:
135135
conditions:
136136
- lastTransitionTime: null
137-
message: All listeners are accepted
138-
reason: Accepted
139-
status: "True"
137+
message: No listeners are accepted
138+
reason: ListenersNotValid
139+
status: "False"
140140
type: Accepted
141141
- lastTransitionTime: null
142142
message: No listeners are programmed
@@ -152,11 +152,6 @@ listenerSets:
152152
reason: RefNotPermitted
153153
status: "False"
154154
type: ResolvedRefs
155-
- lastTransitionTime: null
156-
message: Listener has been successfully translated
157-
reason: Accepted
158-
status: "True"
159-
type: Accepted
160155
- lastTransitionTime: null
161156
message: Listener is invalid, see other Conditions for details.
162157
reason: ListenersNotValid

internal/gatewayapi/validate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ func (t *Translator) validateListenerConditions(listener *ListenerContext) {
299299
listener.SetCondition(gwapiv1.ListenerConditionProgrammed, metav1.ConditionTrue, gwapiv1.ListenerReasonProgrammed,
300300
"Sending translated listener configuration to the data plane")
301301
return
302-
case string(gwapiv1.ListenerReasonInvalidCertificateRef), string(gwapiv1.ListenerReasonRefNotPermitted):
302+
case string(gwapiv1.ListenerReasonInvalidCertificateRef):
303303
// The listener configuration is semantically valid, but the listener cannot serve traffic with an invalid certificate.
304304
listener.SetCondition(gwapiv1.ListenerConditionAccepted, metav1.ConditionTrue, gwapiv1.ListenerReasonAccepted,
305305
"Listener has been successfully translated")

0 commit comments

Comments
 (0)