check crd generator

.github/workflows/build-for-quarkus-version.yml

@@ -4,6 +4,7 @@ on:
   workflow_call:
     inputs:
       quarkus-version-jq-cmd:
+        description: 'jq command to extract which Quarkus version to use from https://registry.quarkus.io/client/platforms'
         type: string
         required: false
       quarkus-version:
@@ -30,14 +31,23 @@ on:
         default: 'default'
   workflow_dispatch:
     inputs:
+      quarkus-version-jq-cmd:
+        description: 'jq command to extract which Quarkus version to use from https://registry.quarkus.io/client/platforms'
+        type: string
+        required: false
+        default: '.platforms[0]."current-stream-id" as $current | .platforms[0].streams[] | select(.id == $current) | .releases[0].version'
       josdk-pr:
         description: 'JOSDK PR number (or main) to use to build QOSDK with'
         type: string
         required: false
       quarkus-pr:
         description: 'Quarkus PR number to use to run a QOSDK build with'
         type: string
-        required: true
+        required: false
+      fkc-pr:
+        description: 'Fabric8 client PR number to use to run a QOSDK build with'
+        type: string
+        required: false
       java-version:
         description: 'Java version to build with'
         type: string
@@ -123,6 +133,25 @@ jobs:
           mvn -Dquickly
           cd -
 
+      - name: Check-out Fabric8 client PR if requested
+        uses: actions/checkout@v4
+        if: "${{ inputs.fkc-pr != '' }}"
+        with:
+          repository: fabric8io/kubernetes-client
+          path: fkc
+
+      - name: Build Fabric8 client PR if requested
+        if: "${{ inputs.fkc-pr != '' }}"
+        id: build-fkc-pr
+        run: |
+          cd fkc
+          git fetch origin pull/${{ github.event.inputs.fkc-pr }}/head:pr-to-check
+          git switch pr-to-check
+          mvn versions:set -DnewVersion=999.${{ github.event.inputs.fkc-pr }}-SNAPSHOT versions:commit
+          echo "f8_pr_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
+          mvn clean install -DskipTests
+          cd -
+
       - name: Retrieve Quarkus version from platform
         if: "${{ inputs.quarkus-version == '' && inputs.quarkus-pr == ''}}"
         id: get-quarkus-version
@@ -155,6 +184,12 @@ jobs:
           echo "Computed Maven profiles: ${maven_profiles}"
           echo "maven_profiles=${maven_profiles}" >> $GITHUB_OUTPUT
 
+      - name: Change Fabric8 client version
+        if: "${{ inputs.fkc-pr != '' }}"
+        run: |
+          echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}"
+          sed -r -i "s@<fabric8-client.version>[^<]+</fabric8-client.version>@<fabric8-client.version>${{ steps.build-fkc-pr.outputs.f8_pr_version }}</fabric8-client.version>@" bom/pom.xml
+
       - name: Change Quarkus version
         run: |
           echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}"
@@ -172,6 +207,10 @@ jobs:
       - name: Build with Maven (JVM)
         run: mvn -B formatter:validate install -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' --file pom.xml
 
+      - name: Dependency tree on failure
+        if: failure()
+        run: mvn -B dependency:tree -Dverbose
+
       - name: Kubernetes KinD Cluster
         uses: container-tools/kind-action@v2
         with:

.github/workflows/build.yml

@@ -1,9 +1,12 @@
 name: Build PRs and main when updated
 
 on:
+  schedule:
+    # daily run
+    - cron: '0 0 * * *'
   push:
     branches:
-      - "main"
+      - "next-fabric8-version"
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -83,7 +86,8 @@ jobs:
         java-version: [ 17, 21 ]
     uses: ./.github/workflows/build-for-quarkus-version.yml
     with:
-      quarkus-version: ${{ needs.extract-project-metadata.outputs.latest_stable_quarkus }}
+#      quarkus-version: ${{ needs.extract-project-metadata.outputs.latest_stable_quarkus }}
+      quarkus-version: 999-SNAPSHOT
       java-version: ${{ matrix.java-version }}
       branch: ${{ needs.extract-project-metadata.outputs.branch_name }}
       native-modules: "integration-tests"

bom/pom.xml

@@ -38,8 +38,19 @@
     <url>https://github.com/quarkiverse/quarkus-operator-sdk/issues/</url>
   </issueManagement>
 
+  <properties>
+    <fabric8-client.version>6.12-SNAPSHOT</fabric8-client.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.fabric8</groupId>
+        <artifactId>kubernetes-client-bom</artifactId>
+        <version>${fabric8-client.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-bom</artifactId>

build-parent/pom.xml

@@ -16,6 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>

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>

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;

core/deployment/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(),