wip: meant to test fabric8io/kubernetes-client#5949

Signed-off-by: Chris Laprun <claprun@redhat.com>
quarkiverse · Apr 30, 2024 · ca490c4 · ca490c4
1 parent c0e303c
commit ca490c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -39,7 +39,7 @@
   </issueManagement>
 
   <properties>
-    <fabric8-client.version>6.12-SNAPSHOT</fabric8-client.version>
+    <fabric8-client.version>6.13.crd-SNAPSHOT</fabric8-client.version>
   </properties>
 
   <dependencyManagement>

diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>crd-generator-api</artifactId>
+      <artifactId>crd-generator-api-v2</artifactId>
     </dependency>
     <dependency>
       <groupId>org.semver4j</groupId>

diff --git a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java
@@ -12,8 +12,8 @@
 
 import org.jboss.logging.Logger;
 
-import io.fabric8.crd.generator.CRDGenerator;
-import io.fabric8.crd.generator.CustomResourceInfo;
+import io.fabric8.crdv2.generator.CRDGenerator;
+import io.fabric8.crdv2.generator.CustomResourceInfo;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.quarkiverse.operatorsdk.common.CustomResourceAugmentedClassInfo;
 import io.quarkiverse.operatorsdk.common.FileUtils;

diff --git a/...oyment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java b/...oyment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java
@@ -17,7 +17,7 @@ public Map<String, ResourceInfo> getResourceInfos(String resourceFullName) {
         return infos;
     }
 
-    public void add(io.fabric8.crd.generator.CustomResourceInfo info, String crdName, String associatedControllerName) {
+    public void add(io.fabric8.crdv2.generator.CustomResourceInfo info, String crdName, String associatedControllerName) {
         final var version = info.version();
         final var versionsForCR = resourceFullNameToVersionToInfos.computeIfAbsent(crdName, s -> new HashMap<>());
         final var cri = versionsForCR.get(version);
@@ -41,7 +41,7 @@ public void add(io.fabric8.crd.generator.CustomResourceInfo info, String crdName
         versionsForCR.put(version, converted);
     }
 
-    private static ResourceInfo augment(io.fabric8.crd.generator.CustomResourceInfo info,
+    private static ResourceInfo augment(io.fabric8.crdv2.generator.CustomResourceInfo info,
             String crdName, String associatedControllerName) {
         return new ResourceInfo(
                 info.group(), info.version(), info.kind(), info.singular(), info.plural(), info.shortNames(),