impl

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

sample-operators/controller-namespace-deletion/k8s/operator.yaml

@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: operator
+  finalizers:
+    - controller.deletion/finalizer
 
 ---
 apiVersion: v1

sample-operators/controller-namespace-deletion/src/main/java/io/javaoperatorsdk/operator/sample/ControllerNamespaceDeletionOperator.java

@@ -33,9 +33,12 @@ public static void main(String[] args) {
   private static boolean waitUntilResourcesDeleted() {
     try (var client = new KubernetesClientBuilder().build()) {
       var startTime = LocalTime.now();
-      while (startTime.until(LocalTime.now(), SECONDS) < 30) {
+      while (startTime.until(LocalTime.now(), SECONDS) < 20) {
         var items =
-            client.resources(ControllerNamespaceDeletionCustomResource.class).list().getItems();
+            client.resources(ControllerNamespaceDeletionCustomResource.class)
+                .inNamespace(client.getConfiguration().getNamespace())
+                .list().getItems();
+        log.info("Custom resource in namespace: {}", items);
         if (items.isEmpty()) {
           return true;
         }

sample-operators/controller-namespace-deletion/src/main/java/io/javaoperatorsdk/operator/sample/ControllerNamespaceDeletionReconciler.java

@@ -48,6 +48,7 @@ private ControllerNamespaceDeletionCustomResource createResponseResource(
   @Override
   public DeleteControl cleanup(ControllerNamespaceDeletionCustomResource resource,
       Context<ControllerNamespaceDeletionCustomResource> context) {
+    log.info("Cleaning up resource");
     try {
       Thread.sleep(CLEANUP_DELAY.toMillis());
       return DeleteControl.defaultDelete();

sample-operators/controller-namespace-deletion/src/test/java/io/javaoperatorsdk/operator/sample/ControllerNamespaceDeletionE2E.java

@@ -63,7 +63,7 @@ void customResourceCleanedUpOnNamespaceDeletion() {
     log.info("Removing finalizers from role and role bing");
     removeRoleAndRoleBindingFinalizers();
 
-    await().untilAsserted(() -> {
+    await().timeout(Duration.ofSeconds(20)).untilAsserted(() -> {
       var ns = client.namespaces().withName(namespace).get();
       assertThat(ns).isNull();
     });
@@ -79,6 +79,9 @@ private void removeRoleAndRoleBindingFinalizers() {
     role.getFinalizers().clear();
     client.resource(role).update();
 
+    var sa = client.serviceAccounts().inNamespace(namespace).withName(RESOURCE_NAME).get();
+    sa.getMetadata().getFinalizers().clear();
+    client.resource(sa).update();
   }
 
   ControllerNamespaceDeletionCustomResource testResource() {