Fix Route deletion after route listener is removed (strimzi#10845)

Signed-off-by: Jakub Scholz <[email protected]>
see-quick · Nov 20, 2024 · 8dbaae3 · 8dbaae3
1 parent 7c260aa
commit 8dbaae3
Show file tree

Hide file tree

Showing 2 changed files with 417 additions and 6 deletions.
diff --git a/...src/main/java/io/strimzi/operator/cluster/operator/assembly/KafkaListenersReconciler.java b/...src/main/java/io/strimzi/operator/cluster/operator/assembly/KafkaListenersReconciler.java
@@ -157,15 +157,15 @@ protected Future<Void> routes() {
         List<Route> routes = new ArrayList<>(kafka.generateExternalBootstrapRoutes());
         routes.addAll(kafka.generateExternalRoutes());
 
-        if (routes.size() > 0) {
-            if (pfa.hasRoutes()) {
-                return routeOperator.batchReconcile(reconciliation, reconciliation.namespace(), routes, kafka.getSelectorLabels()).map((Void) null);
-            } else {
+        if (pfa.hasRoutes()) {
+            return routeOperator.batchReconcile(reconciliation, reconciliation.namespace(), routes, kafka.getSelectorLabels()).map((Void) null);
+        } else {
+            if (!routes.isEmpty()) {
                 LOGGER.warnCr(reconciliation, "The OpenShift route API is not available in this Kubernetes cluster. Exposing Kafka cluster {} using routes is not possible.", reconciliation.name());
                 return Future.failedFuture("The OpenShift route API is not available in this Kubernetes cluster. Exposing Kafka cluster " + reconciliation.name() + " using routes is not possible.");
+            } else {
+                return Future.succeededFuture();
             }
-        } else {
-            return Future.succeededFuture();
         }
     }