Skip to content

Commit d82dafd

Browse files
authored
refactor: use Quarkus-specific version retrieval, optimize common case (#602)
1 parent 8612913 commit d82dafd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Collections;
55
import java.util.HashSet;
66
import java.util.Map;
7+
import java.util.Objects;
78
import java.util.Optional;
89
import java.util.Set;
910
import java.util.function.BooleanSupplier;
@@ -64,7 +65,6 @@
6465
import io.quarkus.gizmo.ResultHandle;
6566
import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
6667
import io.quarkus.kubernetes.spi.DecoratorBuildItem;
67-
import io.quarkus.runtime.Quarkus;
6868
import io.quarkus.runtime.QuarkusApplication;
6969
import io.quarkus.runtime.metrics.MetricsFactory;
7070

@@ -136,6 +136,10 @@ void updateControllerConfigurations(
136136
}
137137

138138
private void checkVersionCompatibility(String found, String expected, String name) {
139+
// optimize most common case
140+
if(Objects.equals(found, expected)) {
141+
return;
142+
}
139143
final var foundVersionOpt = getSemverFrom(found);
140144
final var expectedVersionOpt = getSemverFrom(expected);
141145
if (foundVersionOpt.isEmpty() || expectedVersionOpt.isEmpty()) {
@@ -185,7 +189,7 @@ ConfigurationServiceBuildItem createConfigurationServiceAndOperator(
185189
// check versions alignment
186190
final var version = Version.loadFromProperties();
187191
versionBuildItemBuildProducer.produce(new VersionBuildItem(version));
188-
final var runtimeQuarkusVersion = Quarkus.class.getPackage().getImplementationVersion();
192+
final var runtimeQuarkusVersion = io.quarkus.builder.Version.getVersion();
189193
checkVersionCompatibility(runtimeQuarkusVersion, version.getQuarkusVersion(), "Quarkus");
190194
final var runtimeFabric8Version = io.fabric8.kubernetes.client.Version.clientVersion();
191195
checkVersionCompatibility(runtimeFabric8Version, version.getKubernetesClientVersion(),

0 commit comments

Comments
 (0)