Skip to content

Commit bc5e49d

Browse files
authored
fix: start operator by default all the time now (#789)
1 parent 2da0bf4 commit bc5e49d

File tree

5 files changed

+7
-48
lines changed

5 files changed

+7
-48
lines changed

core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/OperatorSDKProcessor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,13 @@ void updateControllerConfigurations(
124124
BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
125125
GeneratedCRDInfoBuildItem generatedCRDs,
126126
ControllerConfigurationsBuildItem serviceBuildItem,
127-
VersionBuildItem versionBuildItem,
128-
LaunchModeBuildItem launchMode) {
127+
VersionBuildItem versionBuildItem) {
129128
final var supplier = recorder.configurationServiceSupplier(
130129
versionBuildItem.getVersion(),
131130
serviceBuildItem.getControllerConfigs(),
132131
generatedCRDs.getCRDGenerationInfo(),
133132
runTimeConfiguration,
134-
buildTimeConfiguration,
135-
launchMode.getLaunchMode());
133+
buildTimeConfiguration);
136134
syntheticBeanBuildItemBuildProducer.produce(
137135
SyntheticBeanBuildItem.configure(QuarkusConfigurationService.class)
138136
.scope(Singleton.class)

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/BuildTimeOperatorConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class BuildTimeOperatorConfiguration {
4242
* Whether the operator should be automatically started or not. Mostly useful for testing
4343
* scenarios.
4444
*/
45-
@ConfigItem
46-
public Optional<Boolean> startOperator;
45+
@ConfigItem(defaultValue = "true")
46+
public Boolean startOperator;
4747

4848
/**
4949
* Whether the injected Kubernetes client should be stopped when the operator is stopped.

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/ConfigurationServiceRecorder.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
1818
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
1919
import io.quarkus.arc.Arc;
20-
import io.quarkus.runtime.LaunchMode;
2120
import io.quarkus.runtime.annotations.Recorder;
2221
import io.quarkus.runtime.configuration.ConfigUtils;
2322

@@ -30,7 +29,7 @@ public class ConfigurationServiceRecorder {
3029
public Supplier<QuarkusConfigurationService> configurationServiceSupplier(Version version,
3130
Map<String, QuarkusControllerConfiguration> configurations,
3231
CRDGenerationInfo crdInfo, RunTimeOperatorConfiguration runTimeConfiguration,
33-
BuildTimeOperatorConfiguration buildTimeConfiguration, LaunchMode launchMode) {
32+
BuildTimeOperatorConfiguration buildTimeConfiguration) {
3433
final var maxThreads = runTimeConfiguration.concurrentReconciliationThreads
3534
.orElse(ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER);
3635
final var timeout = runTimeConfiguration.terminationTimeoutSeconds
@@ -89,7 +88,7 @@ public Supplier<QuarkusConfigurationService> configurationServiceSupplier(Versio
8988
timeout,
9089
cacheSyncTimeout,
9190
container.instance(Metrics.class).get(),
92-
shouldStartOperator(buildTimeConfiguration.startOperator, launchMode),
91+
buildTimeConfiguration.startOperator,
9392
leaderElectionConfiguration,
9493
container.instance(InformerStoppedHandler.class).orElse(null),
9594
buildTimeConfiguration.closeClientOnStop,
@@ -116,12 +115,4 @@ private static void setNamespacesFromRuntime(QuarkusControllerConfiguration cont
116115
controllerConfig.setNamespaces(DEFAULT_NAMESPACES_SET);
117116
}
118117
}
119-
120-
static boolean shouldStartOperator(Optional<Boolean> fromConfiguration, LaunchMode launchMode) {
121-
if (fromConfiguration == null || fromConfiguration.isEmpty()) {
122-
return LaunchMode.TEST != launchMode;
123-
} else {
124-
return fromConfiguration.orElse(true);
125-
}
126-
}
127118
}

core/runtime/src/test/java/io/quarkiverse/operatorsdk/runtime/ConfigurationServiceRecorderTest.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ ifndef::add-copy-button-to-env-var[]
194194
Environment variable: `+++QUARKUS_OPERATOR_SDK_START_OPERATOR+++`
195195
endif::add-copy-button-to-env-var[]
196196
--|boolean
197-
|
197+
|`true`
198198

199199

200200
a|icon:lock[title=Fixed at build time] [[quarkus-operator-sdk_quarkus.operator-sdk.close-client-on-stop]]`link:#quarkus-operator-sdk_quarkus.operator-sdk.close-client-on-stop[quarkus.operator-sdk.close-client-on-stop]`

0 commit comments

Comments
 (0)