Skip to content

Fix CRD-Generator tests and examples #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2024
Merged

Fix CRD-Generator tests and examples #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
<goals>
<goal>generate</goal>
</goals>
<configuration>
<classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions operator-framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change necessary? I think we used different visibility on purpose to check if this was possible to do…

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm currently looking into this. It was somehow necessary in this project to get it working on my machine.
It's possible that this is a not yet known "breaking" change.

Copy link
Author

@baloo42 baloo42 Nov 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the root cause here https://github.com/fabric8io/kubernetes-client/blob/main/crd-generator/api-v2/src/main/java/io/fabric8/crdv2/generator/CustomResourceInfo.java#L168

getDeclaredConstructor() does only work with public classes.

fabric8io/kubernetes-client#6685

}

@ControllerConfiguration
Expand Down
2 changes: 1 addition & 1 deletion ...ramework/src/test/java/io/javaoperatorsdk/operator/config/runtime/TestCustomResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

}
3 changes: 0 additions & 3 deletions sample-operators/mysql-schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
<goals>
<goal>generate</goal>
</goals>
<configuration>
<classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions sample-operators/tomcat-operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@
<goals>
<goal>generate</goal>
</goals>
<configuration>
<classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 0 additions & 3 deletions sample-operators/webpage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@
<goals>
<goal>generate</goal>
</goals>
<configuration>
<classpath>WITH_ALL_DEPENDENCIES_AND_TESTS</classpath>
</configuration>
</execution>
</executions>
</plugin>
Expand Down