Skip to content

Commit 3fc1f70

Browse files
authored
fix: fix KongPlugin watch functions (#3186)
1 parent a852bd7 commit 3fc1f70

File tree

5 files changed

+513
-6
lines changed

5 files changed

+513
-6
lines changed

controller/konnect/watch.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,12 @@ func objectListToReconcileRequests[
132132
}
133133

134134
ret := make([]ctrl.Request, 0, len(items))
135+
itemLoop:
135136
for _, item := range items {
136137
var e TPtr = &item
137138
for _, filter := range filters {
138139
if filter != nil && !filter(e) {
139-
continue
140+
continue itemLoop
140141
}
141142
}
142143
ret = append(ret, ctrl.Request{

controller/konnect/watch_kongplugin.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,16 @@ func (r *KongPluginReconciler) mapKongPluginBindings(ctx context.Context, obj cl
7171
return []ctrl.Request{}
7272
}
7373

74+
ns := kongPluginBinding.Namespace
75+
pluginRef := kongPluginBinding.Spec.PluginReference
76+
if pluginRef.Namespace != "" && pluginRef.Namespace != ns {
77+
ns = pluginRef.Namespace
78+
}
79+
7480
return []ctrl.Request{
7581
{
7682
NamespacedName: types.NamespacedName{
77-
Namespace: kongPluginBinding.Namespace,
83+
Namespace: ns,
7884
Name: kongPluginBinding.Spec.PluginReference.Name,
7985
},
8086
},

controller/konnect/watch_kongpluginbinding.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ func enqueueKongPluginBindingForKongPlugin(cl client.Client) func(
144144

145145
pluginBindingList := configurationv1alpha1.KongPluginBindingList{}
146146
err := cl.List(ctx, &pluginBindingList,
147-
// Currently KongPlugin and KongPluginBinding must be in the same namespace to reference the plugin.
148-
client.InNamespace(plugin.Namespace),
149147
client.MatchingFields{
150148
index.IndexFieldKongPluginBindingKongPluginReference: plugin.Namespace + "/" + plugin.Name,
151149
},

0 commit comments

Comments
 (0)