Skip to content

Commit 29bc167

Browse files
committed
wip
Signed-off-by: Attila Mészáros <[email protected]>
1 parent f5e22f4 commit 29bc167

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile;
1+
package io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile;
22

33
import io.fabric8.kubernetes.api.model.Namespaced;
44
import io.fabric8.kubernetes.client.CustomResource;
@@ -9,5 +9,5 @@
99
@Group("sample.javaoperatorsdk")
1010
@Version("v1")
1111
@ShortNames("aecs")
12-
public class PropagateAllEventCustomResource extends CustomResource<PropagateAllEventSpec, Void>
13-
implements Namespaced {}
12+
public class TriggerReconcilerOnAllEventCustomResource
13+
extends CustomResource<TriggerReconcilerOnAllEventSpec, Void> implements Namespaced {}
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile;
1+
package io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile;
22

33
import java.time.Duration;
44

@@ -9,13 +9,13 @@
99
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
1010
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
1111

12-
import static io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile.PropagateEventReconciler.ADDITIONAL_FINALIZER;
13-
import static io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile.PropagateEventReconciler.FINALIZER;
14-
import static io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile.PropagateEventReconciler.NO_MORE_EXCEPTION_ANNOTATION_KEY;
12+
import static io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile.TriggerReconcilerOnAllEventReconciler.ADDITIONAL_FINALIZER;
13+
import static io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile.TriggerReconcilerOnAllEventReconciler.FINALIZER;
14+
import static io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile.TriggerReconcilerOnAllEventReconciler.NO_MORE_EXCEPTION_ANNOTATION_KEY;
1515
import static org.assertj.core.api.Assertions.assertThat;
1616
import static org.awaitility.Awaitility.await;
1717

18-
public class PropagateAllEventIT {
18+
public class TriggerReconcilerOnAllEventIT {
1919

2020
public static final String TEST = "test1";
2121
public static final int MAX_RETRY_ATTEMPTS = 2;
@@ -24,7 +24,7 @@ public class PropagateAllEventIT {
2424
LocallyRunOperatorExtension extension =
2525
LocallyRunOperatorExtension.builder()
2626
.withReconciler(
27-
new PropagateEventReconciler(),
27+
new TriggerReconcilerOnAllEventReconciler(),
2828
o ->
2929
o.withRetry(
3030
new GenericRetry()
@@ -35,7 +35,7 @@ public class PropagateAllEventIT {
3535

3636
@Test
3737
void eventsPresent() {
38-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
38+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
3939
extension.serverSideApply(testResource());
4040
await()
4141
.untilAsserted(
@@ -58,7 +58,7 @@ void eventsPresent() {
5858

5959
@Test
6060
void deleteEventPresentWithoutFinalizer() {
61-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
61+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
6262
reconciler.setUseFinalizer(false);
6363
extension.serverSideApply(testResource());
6464

@@ -77,7 +77,7 @@ void deleteEventPresentWithoutFinalizer() {
7777

7878
@Test
7979
void retriesExceptionOnDeleteEvent() {
80-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
80+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
8181
reconciler.setUseFinalizer(false);
8282
reconciler.setThrowExceptionOnFirstDeleteEvent(true);
8383

@@ -98,7 +98,7 @@ void retriesExceptionOnDeleteEvent() {
9898

9999
@Test
100100
void additionalFinalizer() {
101-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
101+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
102102
reconciler.setUseFinalizer(true);
103103
var res = testResource();
104104
res.addFinalizer(ADDITIONAL_FINALIZER);
@@ -132,7 +132,7 @@ void additionalFinalizer() {
132132
@Test
133133
void additionalEventDuringRetryOnDeleteEvent() {
134134

135-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
135+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
136136
reconciler.setThrowExceptionIfNoAnnotation(true);
137137
reconciler.setWaitAfterFirstRetry(true);
138138
var res = testResource();
@@ -189,7 +189,7 @@ void additionalEventDuringRetryOnDeleteEvent() {
189189
@Test
190190
void additionalEventAfterExhaustedRetry() {
191191

192-
var reconciler = extension.getReconcilerOfType(PropagateEventReconciler.class);
192+
var reconciler = extension.getReconcilerOfType(TriggerReconcilerOnAllEventReconciler.class);
193193
reconciler.setThrowExceptionIfNoAnnotation(true);
194194
var res = testResource();
195195
res.addFinalizer(ADDITIONAL_FINALIZER);
@@ -223,18 +223,18 @@ private void removeAdditionalFinalizerWaitForResourceDeletion() {
223223
}
224224

225225
private void addNoMoreExceptionAnnotation() {
226-
PropagateAllEventCustomResource res;
226+
TriggerReconcilerOnAllEventCustomResource res;
227227
res = getResource();
228228
res.getMetadata().getAnnotations().put(NO_MORE_EXCEPTION_ANNOTATION_KEY, "true");
229229
extension.update(res);
230230
}
231231

232-
PropagateAllEventCustomResource getResource() {
233-
return extension.get(PropagateAllEventCustomResource.class, TEST);
232+
TriggerReconcilerOnAllEventCustomResource getResource() {
233+
return extension.get(TriggerReconcilerOnAllEventCustomResource.class, TEST);
234234
}
235235

236-
PropagateAllEventCustomResource testResource() {
237-
var res = new PropagateAllEventCustomResource();
236+
TriggerReconcilerOnAllEventCustomResource testResource() {
237+
var res = new TriggerReconcilerOnAllEventCustomResource();
238238
res.setMetadata(new ObjectMetaBuilder().withName(TEST).build());
239239
return res;
240240
}
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile;
1+
package io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile;
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

@@ -12,9 +12,11 @@
1212
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1313

1414
@ControllerConfiguration(triggerReconcilerOnAllEvent = true, generationAwareEventProcessing = false)
15-
public class PropagateEventReconciler implements Reconciler<PropagateAllEventCustomResource> {
15+
public class TriggerReconcilerOnAllEventReconciler
16+
implements Reconciler<TriggerReconcilerOnAllEventCustomResource> {
1617

17-
private static final Logger log = LoggerFactory.getLogger(PropagateEventReconciler.class);
18+
private static final Logger log =
19+
LoggerFactory.getLogger(TriggerReconcilerOnAllEventReconciler.class);
1820

1921
private volatile boolean throwExceptionOnFirstDeleteEvent = false;
2022
private volatile boolean throwExceptionIfNoAnnotation = false;
@@ -38,8 +40,9 @@ public class PropagateEventReconciler implements Reconciler<PropagateAllEventCus
3840
private boolean resourceEventPresent = false;
3941

4042
@Override
41-
public UpdateControl<PropagateAllEventCustomResource> reconcile(
42-
PropagateAllEventCustomResource primary, Context<PropagateAllEventCustomResource> context)
43+
public UpdateControl<TriggerReconcilerOnAllEventCustomResource> reconcile(
44+
TriggerReconcilerOnAllEventCustomResource primary,
45+
Context<TriggerReconcilerOnAllEventCustomResource> context)
4346
throws InterruptedException {
4447
log.info("Reconciling");
4548
increaseEventCount();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.javaoperatorsdk.operator.baseapi.propagateallevent.onlyreconcile;
1+
package io.javaoperatorsdk.operator.baseapi.triggerallevent.onlyreconcile;
22

3-
public class PropagateAllEventSpec {
3+
public class TriggerReconcilerOnAllEventSpec {
44

55
private String value;
66

0 commit comments

Comments
 (0)