From 67a0227f5265f0c6dc9489adba24bdf3ec9185bb Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 18 Oct 2023 14:03:46 +0200 Subject: [PATCH 1/2] add logging to help identify issue with failing e2e test Signed-off-by: csviri --- .../source/informer/InformerEventSource.java | 1 + .../operator/sample/WebPageReconciler.java | 6 +++++- .../ConfigMapDependentResource.java | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java index 968ccc27b9..f900e602ce 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java @@ -123,6 +123,7 @@ public void onAdd(R newResource) { @Override public void onUpdate(R oldObject, R newObject) { + log.debug("On updated with old: {} \n new: {}", oldObject, newObject); if (log.isDebugEnabled()) { log.debug( "On update event received for resource id: {} type: {} version: {} old version: {} ", diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index 2680e18010..01b3b4f8c1 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -181,10 +181,14 @@ private boolean match(Service desiredService, Service service) { } private boolean match(ConfigMap desiredHtmlConfigMap, ConfigMap existingConfigMap) { + log.debug("Actual config map: {}, desired configMap: {}", existingConfigMap, + desiredHtmlConfigMap); if (existingConfigMap == null) { return false; } else { - return desiredHtmlConfigMap.getData().equals(existingConfigMap.getData()); + var matched = desiredHtmlConfigMap.getData().equals(existingConfigMap.getData()); + log.debug("Matched config map: {}", matched); + return matched; } } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java index 8641aa343b..a94cc82376 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java @@ -3,6 +3,9 @@ import java.util.HashMap; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; @@ -19,12 +22,15 @@ public class ConfigMapDependentResource extends CRUDKubernetesDependentResource { + private static final Logger log = LoggerFactory.getLogger(ConfigMapDependentResource.class); + public ConfigMapDependentResource() { super(ConfigMap.class); } @Override protected ConfigMap desired(WebPage webPage, Context context) { + log.debug("Web page spec: {}", webPage.getSpec().getHtml()); Map data = new HashMap<>(); data.put("index.html", webPage.getSpec().getHtml()); Map labels = new HashMap<>(); @@ -39,4 +45,15 @@ protected ConfigMap desired(WebPage webPage, Context context) { .withData(data) .build(); } + + @Override + public Result match(ConfigMap actualResource, WebPage primary, + Context context) { + var matched = super.match(actualResource, primary, context); + log.debug("Match for config map {} res: {}", actualResource.getMetadata().getName(), + matched.matched()); + return matched; + } + + } From 4da1d1f57681ff4c1896c0a26b7c544a96925aa0 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 23 Oct 2023 12:54:26 +0200 Subject: [PATCH 2/2] additional log Signed-off-by: csviri --- .../io/javaoperatorsdk/operator/sample/WebPageReconciler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index 01b3b4f8c1..18021402a5 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -106,8 +106,9 @@ public UpdateControl reconcile(WebPage webPage, Context contex "Creating or updating ConfigMap {} in {}", desiredHtmlConfigMap.getMetadata().getName(), ns); - kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap) + var res = kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap) .createOrReplace(); + log.debug("Updated config map: {}", res); } var existingDeployment = context.getSecondaryResource(Deployment.class).orElse(null);