You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/10/02 22:24:26 UTC

[camel-karavan] branch main updated: Fix #924

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new e95c96cb Fix #924
e95c96cb is described below

commit e95c96cbfb017648603fdb4e93130d24888f829b
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Oct 2 18:24:16 2023 -0400

    Fix #924
---
 .../java/org/apache/camel/karavan/installer/CommandUtils.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/CommandUtils.java b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/CommandUtils.java
index b95c1e2d..ed39a354 100644
--- a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/CommandUtils.java
+++ b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/CommandUtils.java
@@ -60,7 +60,7 @@ public class CommandUtils {
         }
 
         // Check and install Infinispan
-        if (!isInfinispanInstalled(client) && config.isInstallInfinispan()) {
+        if (!isInfinispanInstalled(client, config) && config.isInstallInfinispan()) {
             logError("Infinispan is not installed");
             installInfinispan(config, client);
         }
@@ -198,9 +198,9 @@ public class CommandUtils {
         log("Gitea is installed");
     }
 
-    private static boolean isInfinispanInstalled(KubernetesClient client) {
-        Service service = client.services().withName("infinispan").get();
-        StatefulSet set = client.apps().statefulSets().withName("infinispan").get();
+    private static boolean isInfinispanInstalled(KubernetesClient client, KaravanCommand config) {
+        Service service = client.services().inNamespace(config.getNamespace()).withName("infinispan").get();
+        StatefulSet set = client.apps().statefulSets().inNamespace(config.getNamespace()).withName("infinispan").get();
         return service != null && set != null;
     }