Fix CRD-Generator tests and examples (#2612)

Signed-off-by: Bernhard Strähle <bernhard.straehle@gmail.com>
operator-framework · Nov 30, 2024 · 2a55271 · 2a55271
1 parent e1feb41
commit 2a55271
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 14 deletions.
diff --git a/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml b/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
@@ -89,9 +89,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -119,7 +119,9 @@
             <goals>
               <goal>generate</goal>
             </goals>
+            <phase>process-test-classes</phase>
             <configuration>
+              <classesToScan>${project.build.testOutputDirectory}</classesToScan>
               <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
             </configuration>
           </execution>

diff --git a/...ator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java b/...ator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java
@@ -43,7 +43,7 @@ void correctlyAppliesManuallySpecifiedCRD() {
   @Group("crd.example")
   @Version("v1")
   @Kind("Test")
-  private static class TestCR extends CustomResource<Void, Void> implements Namespaced {
+  public static class TestCR extends CustomResource<Void, Void> implements Namespaced {
   }
 
   @ControllerConfiguration

diff --git a/...ramework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java b/...ramework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java
@@ -7,5 +7,5 @@
 
 @Group("sample.javaoperatorsdk")
 @Version("v1")
-class TestCustomResource extends CustomResource<Void, Void> implements Namespaced {
+public class TestCustomResource extends CustomResource<Void, Void> implements Namespaced {
 }
diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
@@ -89,9 +89,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
@@ -115,9 +115,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml
@@ -86,9 +86,6 @@
                         <goals>
                             <goal>generate</goal>
                         </goals>
-                        <configuration>
-                            <classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>