Skip to content

Commit 668e5f5

Browse files
authored
Merge branch 'main' into issue-2609
2 parents 0ac994b + ca4d54e commit 668e5f5

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Builder
33
# ------------------------------------------------------------------------------
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.4@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.25.4@sha256:294846130303560fa9cb1fcce26b0fb1c35007906abeac9419dce2fc13a07286 AS builder
66

77
WORKDIR /workspace
88
ARG GOPATH

controller/konnect/watch_kongplugin.go

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

74-
// If the KongPluginBinding is unmanaged (created not using an annotation,
75-
// and thus not having KongPlugin as an owner), do not enqueue it.
76-
if !ownerRefIsAnyKongPlugin(kongPluginBinding) {
77-
return nil
78-
}
79-
8074
return []ctrl.Request{
8175
{
8276
NamespacedName: types.NamespacedName{

debug.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Debug image
33
# ------------------------------------------------------------------------------
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.4@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 AS debug
5+
FROM --platform=$BUILDPLATFORM golang:1.25.4@sha256:294846130303560fa9cb1fcce26b0fb1c35007906abeac9419dce2fc13a07286 AS debug
66

77
ARG GOPATH
88
ARG GOCACHE

test/integration/konnect_entities_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ func KonnectEntitiesTestCase(t *testing.T, params konnectEntitiesTestCaseParams)
250250
}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
251251

252252
kp := deploy.ProxyCachePlugin(t, ctx, params.client)
253+
t.Cleanup(deleteObjectAndWaitForDeletionFn(t, kp.DeepCopy()))
254+
253255
kpb := deploy.KongPluginBinding(t, ctx, params.client,
254256
konnect.NewKongPluginBindingBuilder().
255257
WithServiceTarget(ks.Name).
@@ -258,13 +260,12 @@ func KonnectEntitiesTestCase(t *testing.T, params konnectEntitiesTestCaseParams)
258260
Build(),
259261
deploy.WithTestIDLabel(params.testID),
260262
)
261-
t.Cleanup(deleteObjectAndWaitForDeletionFn(t, kp.DeepCopy()))
263+
t.Cleanup(deleteObjectAndWaitForDeletionFn(t, kpb.DeepCopy()))
262264

263265
t.Logf("Waiting for KongPluginBinding to be updated with Konnect ID")
264266
require.EventuallyWithT(t, func(t *assert.CollectT) {
265267
err := GetClients().MgrClient.Get(GetCtx(), types.NamespacedName{Name: kpb.Name, Namespace: params.ns}, kpb)
266268
require.NoError(t, err)
267-
268269
assertKonnectEntityProgrammed(t, kpb)
269270
}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
270271

0 commit comments

Comments
 (0)