File tree Expand file tree Collapse file tree 3 files changed +10
-8
lines changed
operator-framework/src/test/java/io/javaoperatorsdk/operator Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ class ControllerUtilsTest {
21
21
public void returnsValuesFromControllerAnnotationFinalizer () {
22
22
final TestCustomResourceController controller = new TestCustomResourceController (null );
23
23
final String finalizer = ControllerUtils .getFinalizer (controller );
24
- Assertions .assertEquals (ControllerUtils . getDefaultFinalizerIdentifier ( controller ) , finalizer );
24
+ Assertions .assertEquals (TestCustomResourceController . FINALIZER_NAME , finalizer );
25
25
Assertions .assertTrue (HasMetadata .DOMAIN_NAME_MATCHER .reset (finalizer ).matches ());
26
26
assertEquals (TestCustomResource .class , ControllerUtils .getCustomResourceClass (controller ));
27
27
Assertions .assertEquals (TestCustomResourceController .CRD_NAME , ControllerUtils .getCrdName (controller ));
Original file line number Diff line number Diff line change 17
17
import org .slf4j .LoggerFactory ;
18
18
19
19
@ Controller (
20
- generationAwareEventProcessing = false ,
21
- crdName = TestCustomResourceController .CRD_NAME ,
22
- customResourceClass = TestCustomResource .class )
20
+ generationAwareEventProcessing = false ,
21
+ crdName = TestCustomResourceController .CRD_NAME ,
22
+ finalizerName = TestCustomResourceController .FINALIZER_NAME ,
23
+ customResourceClass = TestCustomResource .class )
23
24
public class TestCustomResourceController implements ResourceController <TestCustomResource >, TestExecutionInfoProvider {
24
25
25
26
private static final Logger log = LoggerFactory .getLogger (TestCustomResourceController .class );
Original file line number Diff line number Diff line change 11
11
import org .slf4j .LoggerFactory ;
12
12
13
13
@ Controller (
14
- crdName = SubResourceTestCustomResourceController .CRD_NAME ,
15
- customResourceClass = SubResourceTestCustomResource .class ,
16
- generationAwareEventProcessing = false )
14
+ crdName = SubResourceTestCustomResourceController .CRD_NAME ,
15
+ finalizerName = SubResourceTestCustomResourceController .FINALIZER_NAME ,
16
+ customResourceClass = SubResourceTestCustomResource .class ,
17
+ generationAwareEventProcessing = false )
17
18
public class SubResourceTestCustomResourceController implements ResourceController <SubResourceTestCustomResource >,
18
19
TestExecutionInfoProvider {
19
20
20
21
public static final String CRD_NAME = "subresourcesamples.sample.javaoperatorsdk" ;
21
22
public static final String FINALIZER_NAME = CRD_NAME + ".io/finalizer" ;
22
23
private static final Logger log = LoggerFactory .getLogger (SubResourceTestCustomResourceController .class );
23
24
private final AtomicInteger numberOfExecutions = new AtomicInteger (0 );
24
-
25
+
25
26
@ Override
26
27
public boolean deleteResource (SubResourceTestCustomResource resource , Context <SubResourceTestCustomResource > context ) {
27
28
return true ;
You can’t perform that action at this time.
0 commit comments