Skip to content

Commit 951d28d

Browse files
metacosmcsviri
authored andcommitted
refactor: restore LifecycleAware compatibility
1 parent b09bf5c commit 951d28d

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public void init(LeaderElectionConfiguration config, KubernetesClient client) {
3434
// releaseOnCancel is not used in the underlying implementation
3535
leaderElector = new LeaderElectorBuilder(client,
3636
ConfigurationServiceProvider.instance().getExecutorService())
37-
.withConfig(
38-
new LeaderElectionConfig(lock, config.getLeaseDuration(), config.getRenewDeadline(),
39-
config.getRetryPeriod(), leaderCallbacks(), true, config.getLeaseName()))
40-
.build();
37+
.withConfig(
38+
new LeaderElectionConfig(lock, config.getLeaseDuration(), config.getRenewDeadline(),
39+
config.getRetryPeriod(), leaderCallbacks(), true, config.getLeaseName()))
40+
.build();
4141
}
4242

4343
public boolean isLeaderElectionEnabled() {

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@SuppressWarnings({"unchecked", "rawtypes"})
4646
@Ignore
4747
public class Controller<P extends HasMetadata>
48-
implements Reconciler<P>, Cleaner<P>,
48+
implements Reconciler<P>, LifecycleAware, Cleaner<P>,
4949
RegisteredController<P> {
5050

5151
private static final Logger log = LoggerFactory.getLogger(Controller.class);
@@ -263,6 +263,10 @@ public MixedOperation<P, KubernetesResourceList<P>, Resource<P>> getCRClient() {
263263
return kubernetesClient.resources(configuration.getResourceClass());
264264
}
265265

266+
public void start() throws OperatorException {
267+
start(true);
268+
}
269+
266270
/**
267271
* Registers the specified controller with this operator, overriding its default configuration by
268272
* the specified one (usually created via

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ControllerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void crdShouldNotBeCheckedForNativeResources() {
2424
final var configuration = MockControllerConfiguration.forResource(Secret.class);
2525

2626
final var controller = new Controller<Secret>(reconciler, configuration, client);
27-
controller.start(true);
27+
controller.start();
2828
verify(client, never()).apiextensions();
2929
}
3030

@@ -36,7 +36,7 @@ void crdShouldNotBeCheckedForCustomResourcesIfDisabled() {
3636
try {
3737
ConfigurationServiceProvider.overrideCurrent(o -> o.checkingCRDAndValidateLocalModel(false));
3838
final var controller = new Controller<TestCustomResource>(reconciler, configuration, client);
39-
controller.start(true);
39+
controller.start();
4040
verify(client, never()).apiextensions();
4141
} finally {
4242
ConfigurationServiceProvider.reset();

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public boolean useFinalizer() {
121121
return useFinalizer;
122122
}
123123
};
124-
controller.start(true);
124+
controller.start();
125125

126126
return new ReconciliationDispatcher<>(controller, customResourceFacade);
127127
}

0 commit comments

Comments
 (0)