Skip to content

Commit 8aa10d1

Browse files
author
Soroosh Sarabadani
committed
fix tests
1 parent ede8325 commit 8aa10d1

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
2525
assertTrue(CustomResourceDoneable.class.isAssignableFrom(ControllerUtils.getCustomResourceDoneableClass(new TestCustomResourceController(null))));
2626
}
2727

28-
@Controller(crdName = "test.crd", customResourceClass = TestCustomResource.class, finalizerName = CUSTOM_FINALIZER_NAME)
28+
@Controller(crdName = "test.crd", finalizerName = CUSTOM_FINALIZER_NAME)
2929
static class TestCustomFinalizerController implements ResourceController<TestCustomResource> {
3030

3131
@Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
@Controller(
2020
generationAwareEventProcessing = false,
21-
crdName = TestCustomResourceController.CRD_NAME,
22-
customResourceClass = TestCustomResource.class)
21+
crdName = TestCustomResourceController.CRD_NAME)
2322
public class TestCustomResourceController implements ResourceController<TestCustomResource>, TestExecutionInfoProvider {
2423

2524
private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
@Controller(
1414
crdName = SubResourceTestCustomResourceController.CRD_NAME,
15-
customResourceClass = SubResourceTestCustomResource.class,
1615
generationAwareEventProcessing = false)
1716
public class SubResourceTestCustomResourceController implements ResourceController<SubResourceTestCustomResource>,
1817
TestExecutionInfoProvider {

spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/spingboot/starter/TestController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
import io.javaoperatorsdk.operator.api.Controller;
55
import io.javaoperatorsdk.operator.api.ResourceController;
66
import io.javaoperatorsdk.operator.api.UpdateControl;
7-
import io.javaoperatorsdk.operator.spingboot.starter.model.TestResource;
87
import io.fabric8.kubernetes.client.CustomResource;
98
import org.springframework.stereotype.Component;
109

1110
@Component
12-
@Controller(crdName = "name",
13-
customResourceClass = TestResource.class)
11+
@Controller(crdName = "name")
1412
public class TestController implements ResourceController {
1513

1614
@Override

0 commit comments

Comments
 (0)