refactor: move external CRD configuration to main CRD configuration

Signed-off-by: Chris Laprun <claprun@redhat.com>
quarkiverse · Nov 8, 2024 · 3120324 · 3120324
1 parent bdf846e
commit 3120324
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java b/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java
@@ -115,9 +115,9 @@ private static String getBundleName(AnnotationInstance csvMetadata, String defau
     }
 
     @BuildStep(onlyIf = IsGenerationEnabled.class)
-    UnownedCRDInfoBuildItem unownedCRDInfo(BundleGenerationConfiguration bundleConfiguration,
+    UnownedCRDInfoBuildItem unownedCRDInfo(BuildTimeOperatorConfiguration operatorConfiguration,
             CurateOutcomeBuildItem appInfoBuildItem) {
-        final Optional<List<String>> maybeExternalCRDs = bundleConfiguration.externalCRDLocations();
+        final Optional<List<String>> maybeExternalCRDs = operatorConfiguration.crd().externalCRDLocations();
         final var crds = new CRDInfos();
         if (maybeExternalCRDs.isPresent()) {
             final var moduleRoot = appInfoBuildItem.getApplicationModel().getApplicationModule().getModuleDir().toPath();

diff --git a/...enerator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/ExternalCRDsTest.java b/...enerator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/ExternalCRDsTest.java
@@ -32,7 +32,7 @@ public class ExternalCRDsTest {
             .withApplicationRoot((jar) -> jar
                     .addClasses(First.class, External.class, ExternalDependentResource.class,
                             ReconcilerWithExternalCR.class))
-            .overrideConfigKey("quarkus.operator-sdk.bundle.external-crd-locations",
+            .overrideConfigKey("quarkus.operator-sdk.crd.external-crd-locations",
                     "src/test/external-crds/v1beta1spec.crd.yml, src/test/external-crds/external.crd.yml");
 
     @ProdBuildResults

diff --git a/...rc/main/java/io/quarkiverse/operatorsdk/bundle/runtime/BundleGenerationConfiguration.java b/...rc/main/java/io/quarkiverse/operatorsdk/bundle/runtime/BundleGenerationConfiguration.java
@@ -58,18 +58,4 @@ public interface BundleGenerationConfiguration {
      * @since 6.8.0
      */
     Map<String, BundleConfiguration> bundles();
-
-    /**
-     * A comma-separated list of paths where external CRDs that need to be referenced for non-generated custom resources.
-     * Typical use cases where this might be needed include when custom resource implementations are located in a different
-     * module than the controller implementation or when the CRDs are not generated at all (e.g. in integration cases where your
-     * operator needs to deal with 3rd party custom resources).
-     *
-     * <p>
-     * Paths can be either absolute or relative, in which case they will be resolved from the current module root directory.
-     * </p>
-     *
-     * @since 6.8.4
-     */
-    Optional<List<String>> externalCRDLocations();
 }
diff --git a/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/CRDConfiguration.java b/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/CRDConfiguration.java
@@ -64,4 +64,18 @@ public interface CRDConfiguration {
      * process.
      */
     Optional<List<String>> excludeResources();
+
+    /**
+     * A comma-separated list of paths where external CRDs that need to be referenced for non-generated custom resources.
+     * Typical use cases where this might be needed include when custom resource implementations are located in a different
+     * module than the controller implementation or when the CRDs are not generated at all (e.g. in integration cases where your
+     * operator needs to deal with 3rd party custom resources).
+     *
+     * <p>
+     * Paths can be either absolute or relative, in which case they will be resolved from the current module root directory.
+     * </p>
+     *
+     * @since 6.8.4
+     */
+    Optional<List<String>> externalCRDLocations();
 }