From ab32a585628179fe87050201d80ad563cd437de7 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 20 Jun 2023 10:00:25 +0200 Subject: [PATCH] fix: use SSA matcher for bulk resources --- .../kubernetes/KubernetesDependentResource.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java index b564f41ebc..3fc0c414e2 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java @@ -168,8 +168,16 @@ public Result match(R actualResource, P primary, Context

context) { @SuppressWarnings("unused") public Result match(R actualResource, R desired, P primary, Context

context) { - return GenericKubernetesResourceMatcher.match(desired, actualResource, false, - false, false, context); + if (!context.getControllerConfiguration().getConfigurationService() + .ssaBasedDefaultMatchingForDependentResources()) { + return GenericKubernetesResourceMatcher.match(desired, actualResource, false, + false, false, context); + } else { + addReferenceHandlingMetadata(desired, primary); + var matches = SSABasedGenericKubernetesResourceMatcher.getInstance().matches(actualResource, + desired, context); + return Result.computed(matches, desired); + } } protected void handleDelete(P primary, R secondary, Context

context) {