Skip to content

Commit c757153

Browse files
committed
Revert "add logging to help identify issue with failing e2e test (#2095)" (#2125)
This reverts commit 1e5e03e. Signed-off-by: Attila Mészáros <[email protected]>
1 parent dcebe80 commit c757153

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

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

-1
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

+1-6
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
109109
ns);
110110
var res = kubernetesClient.configMaps().inNamespace(ns).resource(desiredHtmlConfigMap)
111111
.createOr(Replaceable::update);
112-
log.debug("Updated config map: {}", res);
113112
}
114113

115114
var existingDeployment = context.getSecondaryResource(Deployment.class).orElse(null);
@@ -184,14 +183,10 @@ private boolean match(Service desiredService, Service service) {
184183
}
185184

186185
private boolean match(ConfigMap desiredHtmlConfigMap, ConfigMap existingConfigMap) {
187-
log.debug("Actual config map: {}, desired configMap: {}", existingConfigMap,
188-
desiredHtmlConfigMap);
189186
if (existingConfigMap == null) {
190187
return false;
191188
} else {
192-
var matched = desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
193-
log.debug("Matched config map: {}", matched);
194-
return matched;
189+
return desiredHtmlConfigMap.getData().equals(existingConfigMap.getData());
195190
}
196191
}
197192

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

-17
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)