8000 Add /finalizer to the tests · rguillens/java-operator-sdk@2b5ef83 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2b5ef83

Browse files
author
Soroosh Sarabadani
committed
Add /finalizer to the tests
1 parent 7259cb7 commit 2b5ef83

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2222
public class ControllerExecutionIT {
2323

24-
private final static Logger log = LoggerFactory.getLogger(ControllerExecutionIT.class);
2524
public static final String TEST_CUSTOM_RESOURCE_NAME = "test-custom-resource";
2625
private IntegrationTestSupport integrationTestSupport = new IntegrationTestSupport();
2726

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
class ControllerUtilsTest {
1616

17-
public static final String CUSTOM_FINALIZER_NAME = "a.customer.finalizer";
17+
public static final String CUSTOM_FINALIZER_NAME = "a.custom/finalizer";
1818

1919
@Test
2020
public void returnsValuesFromControllerAnnotationFinalizer() {
21-
Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getFinalizer(new TestCustomResourceController(null)));
21+
Assertions.assertEquals(TestCustomResourceController.CRD_NAME + "/finalizer", ControllerUtils.getFinalizer(new TestCustomResourceController(null)));
2222
assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null)));
2323
Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
2424
assertFalse(ControllerUtils.getGenerationEventProcessing(new TestCustomResourceController(null)));

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public SubResourceTestCustomResource createTestCustomResource(String id) {
104104
resource.setMetadata(new ObjectMetaBuilder()
105105
.withName("subresource-" + id)
106106
.withNamespace(TEST_NAMESPACE)
107-
.withFinalizers(SubResourceTestCustomResourceController.CRD_NAME)
107+
.withFinalizers(SubResourceTestCustomResourceController.FINALIZER_NAME)
108108
.build());
109109
resource.setKind("SubresourceSample");
110110
resource.setSpec(new SubResourceTestCustomResourceSpec());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class TestCustomResourceController implements ResourceController<TestCust
2525
private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);
2626

2727
public static final String CRD_NAME = "customservices.sample.javaoperatorsdk";
28+
public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
2829

2930
private final KubernetesClient kubernetesClient;
3031
private final boolean updateStatus;
@@ -55,7 +56,7 @@ public boolean deleteResource(TestCustomResource resource, Context<TestCustomRes
5556
public UpdateControl<TestCustomResource> createOrUpdateResource(TestCustomResource resource,
5657
Context<TestCustomResource> context) {
5758
numberOfExecutions.addAndGet(1);
58-
if (!resource.getMetadata().getFinalizers().contains(CRD_NAME)) {
59+
if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
5960
throw new IllegalStateException("Finalizer is not present.");
6061
}
6162

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class SubResourceTestCustomResourceController implements ResourceControll
1818
TestExecutionInfoProvider {
1919

2020
public static final String CRD_NAME = "subresourcesample.sample.javaoperatorsdk";
21+
public static final String FINALIZER_NAME = CRD_NAME + "/finalizer";
2122
private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
2223
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
2324

@@ -30,7 +31,7 @@ public boolean deleteResource(SubResourceTestCustomResource resource, Context<Su
3031
public UpdateControl<SubResourceTestCustomResource> createOrUpdateResource(SubResourceTestCustomResource resource,
3132
Context<SubResourceTestCustomResource> context) {
3233
numberOfExecutions.addAndGet(1);
33-
if (!resource.getMetadata().getFinalizers().contains(CRD_NAME)) {
34+
if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
3435
throw new IllegalStateException("Finalizer is not present.");
3536
}
3637
log.info("Value: " + resource.getSpec().getValue());

0 commit comments

Comments
 (0)
0