Skip to content

Commit 83a2e18

Browse files
committed
fix: remove use of Quarkus Log which shouldn't be used in extensions
See quarkusio/quarkus#48432
1 parent ff98f6f commit 83a2e18

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import java.util.List;
55
import java.util.Set;
66

7+
import org.jboss.logging.Logger;
8+
79
import io.fabric8.crd.generator.CustomResourceInfo;
810
import io.fabric8.kubernetes.client.CustomResource;
911
import io.quarkiverse.operatorsdk.runtime.CRDInfo;
1012
import io.quarkiverse.operatorsdk.runtime.CRDInfos;
11-
import io.quarkus.logging.Log;
1213

1314
class CRDGeneratorV1 implements CRDGenerator {
15+
private static final Logger log = Logger.getLogger(CRDGeneratorV1.class);
1416
private final io.fabric8.crd.generator.CRDGenerator generator;
1517

1618
public CRDGeneratorV1(boolean parallelGeneration) {
@@ -23,13 +25,13 @@ public void generate(List<String> crdSpecVersions, File outputDir, Set<String> g
2325
final var crdDetailsPerNameAndVersion = info.getCRDDetailsPerNameAndVersion();
2426

2527
crdDetailsPerNameAndVersion.forEach((crdName, initialVersionToCRDInfoMap) -> {
26-
Log.infov("Generated {0} CRD:", crdName);
28+
log.infov("Generated {0} CRD:", crdName);
2729
generated.add(crdName);
2830

2931
initialVersionToCRDInfoMap
3032
.forEach((crdSpecVersion, crdInfo) -> {
3133
final var filePath = crdInfo.getFilePath();
32-
Log.infov(" - ''{0}'' CDR spec -> {1}", crdSpecVersion, filePath);
34+
log.infov(" - ''{0}'' CDR spec -> {1}", crdSpecVersion, filePath);
3335
converted.addCRDInfo(new CRDInfo(crdName,
3436
crdSpecVersion, filePath, crdInfo.getDependentClassNames()));
3537
});

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
import java.util.List;
55
import java.util.Set;
66

7+
import org.jboss.logging.Logger;
8+
79
import io.fabric8.crdv2.generator.CRDPostProcessor;
810
import io.fabric8.crdv2.generator.CustomResourceInfo;
911
import io.fabric8.kubernetes.client.CustomResource;
1012
import io.quarkiverse.operatorsdk.runtime.CRDInfo;
1113
import io.quarkiverse.operatorsdk.runtime.CRDInfos;
12-
import io.quarkus.logging.Log;
1314

1415
class CRDGeneratorV2 implements CRDGenerator {
16+
private static final Logger log = Logger.getLogger(CRDGeneratorV2.class);
1517
private final io.fabric8.crdv2.generator.CRDGenerator generator;
1618

1719
public CRDGeneratorV2(boolean parallelGeneration, CRDPostProcessor postProcessor) {
@@ -28,13 +30,13 @@ public void generate(List<String> crdSpecVersions, File outputDir, Set<String> g
2830
final var crdDetailsPerNameAndVersion = info.getCRDDetailsPerNameAndVersion();
2931

3032
crdDetailsPerNameAndVersion.forEach((crdName, initialVersionToCRDInfoMap) -> {
31-
Log.infov("Generated {0} CRD:", crdName);
33+
log.infov("Generated {0} CRD:", crdName);
3234
generated.add(crdName);
3335

3436
initialVersionToCRDInfoMap
3537
.forEach((crdSpecVersion, crdInfo) -> {
3638
final var filePath = crdInfo.getFilePath();
37-
Log.infov(" - ''{0}'' CRD spec -> {1}", crdSpecVersion, filePath);
39+
log.infov(" - ''{0}'' CRD spec -> {1}", crdSpecVersion, filePath);
3840
converted.addCRDInfo(new CRDInfo(crdName,
3941
crdSpecVersion, filePath, crdInfo.getDependentClassNames()));
4042
});

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import java.util.Optional;
88
import java.util.Set;
99

10+
import org.jboss.logging.Logger;
11+
1012
import io.fabric8.kubernetes.api.model.HasMetadata;
1113
import io.fabric8.kubernetes.api.model.rbac.PolicyRule;
1214
import io.fabric8.kubernetes.api.model.rbac.RoleRef;
@@ -24,12 +26,12 @@
2426
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
2527
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
2628
import io.javaoperatorsdk.operator.processing.retry.Retry;
27-
import io.quarkus.logging.Log;
2829
import io.quarkus.runtime.annotations.IgnoreProperty;
2930
import io.quarkus.runtime.annotations.RecordableConstructor;
3031

3132
@SuppressWarnings("rawtypes")
3233
public class QuarkusBuildTimeControllerConfiguration<R extends HasMetadata> implements ControllerConfiguration<R> {
34+
private static final Logger log = Logger.getLogger(QuarkusBuildTimeControllerConfiguration.class);
3335

3436
private final String associatedReconcilerClassName;
3537
private final String name;
@@ -237,10 +239,9 @@ void updateRetryConfiguration(ExternalGradualRetryConfiguration externalGradualR
237239
// override with configuration from application.properties (if it exists) for GradualRetry
238240
if (externalGradualRetryConfiguration != null) {
239241
if (!(retry instanceof GenericRetry genericRetry)) {
240-
Log.warn(
241-
"Retry configuration in application.properties is only appropriate when using the GenericRetry implementation, yet your Reconciler is configured to use "
242-
+ retry.getClass().getName()
243-
+ " as Retry implementation. Configuration from application.properties will therefore be ignored.");
242+
log.warnv(
243+
"Retry configuration in application.properties is only appropriate when using the GenericRetry implementation, yet your Reconciler is configured to use {0} as Retry implementation. Configuration from application.properties will therefore be ignored.",
244+
retry.getClass().getName());
244245
return;
245246
}
246247
// configurable should be a GenericRetry as validated by RetryResolver

0 commit comments

Comments
 (0)