From ca490c4ccd4fdc8698391e90f0f8d113bcd860de Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 30 Apr 2024 21:46:17 +0200 Subject: [PATCH] wip: meant to test fabric8io/kubernetes-client#5949 Signed-off-by: Chris Laprun --- bom/pom.xml | 2 +- core/deployment/pom.xml | 2 +- .../io/quarkiverse/operatorsdk/deployment/CRDGeneration.java | 4 ++-- .../operatorsdk/deployment/ResourceControllerMapping.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index bb18cf95d..613325a46 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ - 6.12-SNAPSHOT + 6.13.crd-SNAPSHOT diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml index 12e7ac0c8..231f61c36 100644 --- a/core/deployment/pom.xml +++ b/core/deployment/pom.xml @@ -44,7 +44,7 @@ io.fabric8 - crd-generator-api + crd-generator-api-v2 org.semver4j 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 index 270e959fe..a0e7b3bc1 100644 --- 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/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java index 2141d1b98..07106b7d7 100644 --- a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java +++ b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java @@ -17,7 +17,7 @@ public Map 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(),