Skip to content

Commit 14c2f56

Browse files
committed
feat: log dependent reconciliation result
1 parent 28d4a21 commit 14c2f56

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import java.util.Collections;
44
import java.util.HashMap;
5-
import java.util.LinkedList;
6-
import java.util.List;
75
import java.util.Map;
86
import java.util.Optional;
7+
import java.util.stream.Collectors;
98

109
import org.slf4j.Logger;
1110
import org.slf4j.LoggerFactory;
@@ -37,6 +36,7 @@
3736
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
3837
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
3938
import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceProvider;
39+
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
4040
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
4141
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
4242
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
@@ -187,7 +187,19 @@ public String successTypeName(UpdateControl<P> result) {
187187
@Override
188188
public UpdateControl<P> execute() throws Exception {
189189
initContextIfNeeded(resource, context);
190-
dependents.values().forEach(dependent -> dependent.reconcile(resource, context));
190+
final var result = dependents.values().stream()
191+
.map(dependent -> {
192+
try {
193+
return dependent.reconcile(resource, context);
194+
} catch (Exception e) {
195+
return ReconcileResult.error(resource, e);
196+
}
197+
});
198+
199+
log.info("Dependents reconciliation:\n{}",
200+
result
201+
.map(r -> "\t" + r.toString())
202+
.collect(Collectors.joining("\n")));
191203
return reconciler.reconcile(resource, context);
192204
}
193205
});

sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ boolean isLocal() {
7070
SchemaDependentResource.NAME,
7171
new ResourcePollerConfig(
7272
700, new MySQLDbConfig("127.0.0.1", LOCAL_PORT.toString(), "root",
73-
"password"))))
73+
"password"))))
7474
.withInfrastructure(infrastructure)
7575
.withPortForward(MY_SQL_NS, "app", "mysql", 3306, LOCAL_PORT)
7676
.build()

0 commit comments

Comments
 (0)