Skip to content

Commit a942970

Browse files
authored
improve: DependentResourceCrossRefIT cleanup and logging (#2883)
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 457c23f commit a942970

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefIT.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,22 @@ void dependentResourceCanReferenceEachOther() {
4444
assertThat(operator.get(Secret.class, TEST_RESOURCE_NAME + i)).isNotNull();
4545
}
4646
});
47+
48+
for (int i = 0; i < EXECUTION_NUMBER; i++) {
49+
operator.delete(testResource(i));
50+
}
51+
await()
52+
.timeout(Duration.ofSeconds(30))
53+
.untilAsserted(
54+
() -> {
55+
for (int i = 0; i < EXECUTION_NUMBER; i++) {
56+
assertThat(
57+
operator.get(
58+
DependentResourceCrossRefResource.class,
59+
testResource(i).getMetadata().getName()))
60+
.isNull();
61+
}
62+
});
4763
}
4864

4965
DependentResourceCrossRefResource testResource(int n) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefReconciler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import java.util.Map;
66
import java.util.concurrent.atomic.AtomicInteger;
77

8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
10+
811
import io.fabric8.kubernetes.api.model.ConfigMap;
912
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
1013
import io.fabric8.kubernetes.api.model.Secret;
@@ -26,6 +29,8 @@
2629
@ControllerConfiguration
2730
public class DependentResourceCrossRefReconciler
2831
implements Reconciler<DependentResourceCrossRefResource> {
32+
private static final Logger log =
33+
LoggerFactory.getLogger(DependentResourceCrossRefReconciler.class);
2934

3035
public static final String SECRET_NAME = "secret";
3136
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
@@ -48,6 +53,7 @@ public ErrorStatusUpdateControl<DependentResourceCrossRefResource> updateErrorSt
4853
DependentResourceCrossRefResource resource,
4954
Context<DependentResourceCrossRefResource> context,
5055
Exception e) {
56+
log.error("Status update on error", e);
5157
errorHappened = true;
5258
return ErrorStatusUpdateControl.noStatusUpdate();
5359
}

0 commit comments

Comments
 (0)