make Gateway controllers watch changes on Secrets referenced by spec.listeners.tls.certificateRef #2661
+285
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tao12345666333
force-pushed
the
fix-secret-watch
branch
2 times, most recently
from
eff2299 to
b643fee
Compare
tao12345666333
force-pushed
the
fix-secret-watch
branch
from
b643fee to
6282675
Compare
pmalek
reviewed
Nov 21, 2025
ingress-controller/internal/controllers/gateway/gateway_controller.go
Outdated
Show resolved
Hide resolved
tao12345666333
force-pushed
the
fix-secret-watch
branch
2 times, most recently
from
3234f73 to
d071cba
Compare
pmalek
reviewed
Nov 24, 2025
Member
pmalek
left a comment
pmalek
left a comment
There was a problem hiding this comment.
Minor nits, overall this is a solid fix 👍
Can we add a changelog entry for this?
ingress-controller/internal/controllers/gateway/gateway_controller.go
Outdated
Show resolved
Hide resolved
pmalek
reviewed
Nov 25, 2025
tao12345666333
force-pushed
the
fix-secret-watch
branch
from
28da430 to
7eedeff
Compare
Contributor
|
please, backport this in 2.0.x so we can release it with #2707 |
…listeners.tls.certificateRef Signed-off-by: Jintao Zhang <[email protected]>
Signed-off-by: Jintao Zhang <[email protected]> Co-authored-by: Patryk Małek <[email protected]>
Co-authored-by: Patryk Małek <[email protected]>
Signed-off-by: Jintao Zhang <[email protected]>
Signed-off-by: Jintao Zhang <[email protected]>
Signed-off-by: Jintao Zhang <[email protected]>
… not GatewayTLSConfig Signed-off-by: Jintao Zhang <[email protected]>
tao12345666333
force-pushed
the
fix-secret-watch
branch
from
ff4647d to
50837e5
Compare
pmalek
reviewed
Nov 26, 2025
Comment on lines
+55
to
+73
| require.Eventually(t, func() bool { | ||
| var cur gatewayv1.GatewayClass | ||
| if err := c.Get(ctx, types.NamespacedName{Name: gc.Name}, &cur); err != nil { | ||
| return false | ||
| } | ||
| cond := metav1.Condition{ | ||
| Type: string(gatewayv1.GatewayClassConditionStatusAccepted), | ||
| Status: metav1.ConditionTrue, | ||
| Reason: string(gatewayv1.GatewayClassReasonAccepted), | ||
| ObservedGeneration: cur.Generation, | ||
| LastTransitionTime: metav1.Now(), | ||
| } | ||
| // Use shared helper to set/merge the condition. | ||
| gwcd := gwcdecor.DecorateGatewayClass(&cur) | ||
| k8sutils.SetCondition(cond, gwcd) | ||
| if err := c.Status().Update(ctx, &cur); err != nil { | ||
| return false | ||
| } | ||
| return true |
Member
There was a problem hiding this comment.
This looks like something that we could reuse. We already have a bunch of similar helpers in https://github.com/Kong/kong-operator/blob/e90fd984547cd60e3ce8c481f368514dd1936411/pkg/utils/test/predicates.go, e.g.
kong-operator/pkg/utils/test/predicates.go
Lines 463 to 484 in e90fd98
I think it would make sense to put it there and use it here. WDYT?
Comment on lines
+128
to
+155
| // waitForGatewayResolvedRefsStatus waits until the Gateway's listener ResolvedRefs condition | ||
| // matches the expected status, or fails after the default timeout. | ||
| func waitForGatewayResolvedRefsStatus( | ||
| t *testing.T, | ||
| ctx context.Context, | ||
| c client.Client, | ||
| namespace, name string, | ||
| status metav1.ConditionStatus, | ||
| ) { | ||
| t.Helper() | ||
| require.Eventually(t, func() bool { | ||
| var cur gatewayv1.Gateway | ||
| if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, &cur); err != nil { | ||
| return false | ||
| } | ||
| if len(cur.Status.Listeners) == 0 { | ||
| return false | ||
| } | ||
| for _, ls := range cur.Status.Listeners { | ||
| for _, cond := range ls.Conditions { | ||
| if cond.Type == string(gatewayv1.ListenerConditionResolvedRefs) && cond.Status == status { | ||
| return true | ||
| } | ||
| } | ||
| } | ||
| return false | ||
| }, waitTime, tickTime) | ||
| } |
Member
There was a problem hiding this comment.
Ditto about defining a reusable test assertion helper.
Comment on lines
+148
to
+167
| handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, s *corev1.Secret) []reconcile.Request { | ||
| // Use field index to list only Gateways that reference this Secret. | ||
| var gwList gwtypes.GatewayList | ||
| nn := client.ObjectKeyFromObject(s) | ||
| if err := r.List(ctx, &gwList, client.MatchingFields{idx.TLSCertificateSecretsOnGatewayIndex: nn.String()}); err != nil { | ||
| ctrllog.FromContext(ctx).Error(err, "failed to list indexed gateways for Secret watch", "secret", nn) | ||
| return nil | ||
| } | ||
| recs := make([]reconcile.Request, 0, len(gwList.Items)) | ||
| for i := range gwList.Items { | ||
| gw := gwList.Items[i] | ||
| // Optional pre-filter: only enqueue Gateways managed by this controller. | ||
| if !r.gatewayHasMatchingGatewayClass(&gw) { | ||
| continue | ||
| } | ||
| recs = append(recs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&gw)}) | ||
| } | ||
| return recs | ||
| }), | ||
| ), |
Member
There was a problem hiding this comment.
WDYT about extracting this into a function and adding a test for it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue this PR fixes
Fixes #2646
Special notes for your reviewer:
PR Readiness Checklist:
Complete these before marking the PR as
ready to review:CHANGELOG.mdrelease notes have been updated to reflect significant changes