Skip to content

Commit 4426544

Browse files
committed
add logging to help identify issue with failing e2e test (#2095)
Signed-off-by: csviri <[email protected]> Signed-off-by: Attila Mészáros <[email protected]>
1 parent 76958c5 commit 4426544

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public void onAdd(R newResource) {
123123

124124
@Override
125125
public void onUpdate(R oldObject, R newObject) {
126+
log.debug("On updated with old: {} \n new: {}", oldObject, newObject);
126127
if (log.isDebugEnabled()) {
127128
log.debug(
128129
"On update event received for resource id: {} type: {} version: {} old version: {} ",

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
106106
"Creating or updating ConfigMap {} in {}",
107107
desiredHtmlConfigMap.getMetadata().getName(),
108108
ns);
109-
kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap)
109+
var res = kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap)
110110
.createOrReplace();
111+
log.debug("Updated config map: {}", res);
111112
}
112113

113114
var existingDeployment = context.getSecondaryResource(Deployment.class).orElse(null);
@@ -181,10 +182,14 @@ private boolean match(Service desiredService, Service service) {
181182
}
182183

183184
private boolean match(ConfigMap desiredHtmlConfigMap, ConfigMap existingConfigMap) {
185+
log.debug("Actual config map: {}, desired configMap: {}", existingConfigMap,
186+
desiredHtmlConfigMap);
184187
if (existingConfigMap == null) {
185188
return false;
186189
} else {
187-
return desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
190+
var matched = desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
191+
log.debug("Matched config map: {}", matched);
192+
return matched;
188193
}
189194
}
190195

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java

+17
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
69
import io.fabric8.kubernetes.api.model.ConfigMap;
710
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
811
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
@@ -19,12 +22,15 @@
1922
public class ConfigMapDependentResource
2023
extends CRUDKubernetesDependentResource<ConfigMap, WebPage> {
2124

25+
private static final Logger log = LoggerFactory.getLogger(ConfigMapDependentResource.class);
26+
2227
public ConfigMapDependentResource() {
2328
super(ConfigMap.class);
2429
}
2530

2631
@Override
2732
protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
33+
log.debug("Web page spec: {}", webPage.getSpec().getHtml());
2834
Map<String, String> data = new HashMap<>();
2935
data.put("index.html", webPage.getSpec().getHtml());
3036
Map<String, String> labels = new HashMap<>();
@@ -39,4 +45,15 @@ protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
3945
.withData(data)
4046
.build();
4147
}
48+
49+
@Override
50+
public Result<ConfigMap> match(ConfigMap actualResource, WebPage primary,
51+
Context<WebPage> context) {
52+
var matched = super.match(actualResource, primary, context);
53+
log.debug("Match for config map {} res: {}", actualResource.getMetadata().getName(),
54+
matched.matched());
55+
return matched;
56+
}
57+
58+
4259
}

0 commit comments

Comments
 (0)