Skip to content

Commit 883fe9b

Browse files
committed
Revert "add logging to help identify issue with failing e2e test (#2095)"
This reverts commit 1e5e03e.
1 parent 092a640 commit 883fe9b

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public void onAdd(R newResource) {
119119

120120
@Override
121121
public void onUpdate(R oldObject, R newObject) {
122-
log.debug("On updated with old: {} \n new: {}", oldObject, newObject);
123122
if (log.isDebugEnabled()) {
124123
log.debug(
125124
"On update event received for resource id: {} type: {} version: {} old version: {} ",

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

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

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

184183
private boolean match(ConfigMap desiredHtmlConfigMap, ConfigMap existingConfigMap) {
185-
log.debug("Actual config map: {}, desired configMap: {}", existingConfigMap,
186-
desiredHtmlConfigMap);
187184
if (existingConfigMap == null) {
188185
return false;
189186
} else {
190-
var matched = desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
191-
log.debug("Matched config map: {}", matched);
192-
return matched;
187+
return desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
193188
}
194189
}
195190

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
96
import io.fabric8.kubernetes.api.model.ConfigMap;
107
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
118
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
@@ -22,15 +19,12 @@
2219
public class ConfigMapDependentResource
2320
extends CRUDKubernetesDependentResource<ConfigMap, WebPage> {
2421

25-
private static final Logger log = LoggerFactory.getLogger(ConfigMapDependentResource.class);
26-
2722
public ConfigMapDependentResource() {
2823
super(ConfigMap.class);
2924
}
3025

3126
@Override
3227
protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
33-
log.debug("Web page spec: {}", webPage.getSpec().getHtml());
3428
Map<String, String> data = new HashMap<>();
3529
data.put("index.html", webPage.getSpec().getHtml());
3630
Map<String, String> labels = new HashMap<>();
@@ -45,15 +39,4 @@ protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
4539
.withData(data)
4640
.build();
4741
}
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-
5942
}

0 commit comments

Comments
 (0)