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/12/27 16:37:09 UTC
(camel-karavan) 02/03: Cleanup
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
commit 61e2c76bca664dd44897ea4b79a34bcb560788f3
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Dec 27 11:36:31 2023 -0500
Cleanup
---
.../main/java/org/apache/camel/karavan/service/CamelService.java | 3 +--
karavan-web/karavan-app/src/main/resources/application.properties | 7 -------
.../main/webui/src/designer/property/property/DslPropertyField.css | 2 +-
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
index 0923251a..c8dbcded 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
@@ -157,8 +157,7 @@ public class CamelService {
public String getContainerAddressForStatus(ContainerStatus containerStatus) {
if (ConfigService.inKubernetes()) {
- String podIP = containerStatus.getPodIP().replace(".", "-");
- return "http://" + podIP + "." + kubernetesService.getNamespace() + ".pod.cluster.local:8080";
+ return "http://" + containerStatus.getPodIP() + ":8080";
} else if (ConfigService.inDocker()) {
return "http://" + containerStatus.getContainerName() + ":8080";
} else {
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties b/karavan-web/karavan-app/src/main/resources/application.properties
index e8564db5..216117b7 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -55,20 +55,13 @@ karavan.image-registry-username=
karavan.image-registry-password=
karavan.image-registry-install=false
-# Infinispan container config in Docker
-karavan.infinispan.image=quay.io/infinispan/server:14.0.17.Final
-karavan.infinispan.port=11222:11222
# Infinispan connection config
karavan.infinispan.username=admin
karavan.infinispan.password=karavan
karavan.infinispan.hosts=infinispan:11222
quarkus.infinispan-client.devservices.enabled=false
-quarkus.infinispan-client.devservices.service-name=infinispan
-quarkus.infinispan-client.devservices.image-name=quay.io/infinispan/server:14.0.17.Final
-quarkus.infinispan-client.devservices.port=11222
quarkus.infinispan-client.health.enabled=false
-quarkus.infinispan-client.client-intelligence=BASIC
# Public Dev
%dev.karavan.auth=public
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.css b/karavan-web/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.css
index 3866f7d6..fa823ac1 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.css
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.css
@@ -19,7 +19,7 @@
padding-right: 12px;
}
-.karavan .designer-page .properties .infra-button {
+.karavan .properties .infra-button {
width: 1em;
height: 1em;
vertical-align: -0.125em;