CRD generator fix

operator-framework · Jul 25, 2022 · e194e01 · e194e01
1 parent 3590a8c
commit e194e01
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 27 deletions.
diff --git a/operator-framework-core/pom.xml b/operator-framework-core/pom.xml
@@ -52,12 +52,10 @@
 
 
   <dependencies>
-    <!-- We use the OpenShift client, because functionally it is a superset of the Kubernetes client -->
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -61,6 +61,11 @@
       <artifactId>crd-generator-apt</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>crd-generator-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/...tor-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java b/...tor-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java
@@ -66,23 +66,24 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) {
   public DeleteControl cleanup(
       TestCustomResource resource, Context<TestCustomResource> context) {
     numberOfCleanupExecutions.incrementAndGet();
-    Boolean delete =
-        kubernetesClient
-            .configMaps()
-            .inNamespace(resource.getMetadata().getNamespace())
-            .withName(resource.getSpec().getConfigMapName())
-            .delete();
-    if (delete) {
-      log.info(
-          "Deleted ConfigMap {} for resource: {}",
-          resource.getSpec().getConfigMapName(),
-          resource.getMetadata().getName());
-    } else {
-      log.error(
-          "Failed to delete ConfigMap {} for resource: {}",
-          resource.getSpec().getConfigMapName(),
-          resource.getMetadata().getName());
-    }
+
+    var statusDetail = kubernetesClient
+        .configMaps()
+        .inNamespace(resource.getMetadata().getNamespace())
+        .withName(resource.getSpec().getConfigMapName())
+        .delete();
+    // todo
+    // if (delete) {
+    log.info(
+        "Deleted ConfigMap {} for resource: {}",
+        resource.getSpec().getConfigMapName(),
+        resource.getMetadata().getName());
+    // } else {
+    // log.error(
+    // "Failed to delete ConfigMap {} for resource: {}",
+    // resource.getSpec().getConfigMapName(),
+    // resource.getMetadata().getName());
+    // }
     return DeleteControl.defaultDelete();
   }
 

diff --git a/pom.xml b/pom.xml
@@ -85,6 +85,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>kubernetes-client-bom</artifactId>
@@ -93,13 +100,16 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${junit.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>io.fabric8</groupId>
+                <artifactId>kubernetes-server-mock</artifactId>
+                <version>${fabric8-client.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>kubernetes-client</artifactId>
+                <version>${fabric8-client.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -115,7 +125,6 @@
                 <artifactId>micrometer-core</artifactId>
                 <version>${micrometer-core.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.squareup</groupId>
                 <artifactId>javapoet</artifactId>

diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
@@ -47,6 +47,10 @@
             <artifactId>crd-generator-apt</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
@@ -32,6 +32,10 @@
             <artifactId>crd-generator-apt</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>

diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml
@@ -40,6 +40,10 @@
             <artifactId>crd-generator-apt</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>

diff --git a/smoke-test-samples/common/pom.xml b/smoke-test-samples/common/pom.xml
@@ -25,7 +25,10 @@
             <artifactId>crd-generator-apt</artifactId>
             <scope>compile</scope>
         </dependency>
-
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>crd-generator-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>