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/07/05 12:07:29 UTC
[camel-karavan] 01/02: Fix #815
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 81d4a9bf90cabb06ad3a4102f8e9a22ecfe3f397
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Jul 5 08:05:15 2023 -0400
Fix #815
---
.../camel/karavan/service/InfinispanService.java | 3 +--
.../src/main/resources/application.properties | 8 +++---
karavan-cli/INFINISPAN.md | 31 ++++++++++++++++++++++
.../src/main/resources/infinispan-secrets.yaml | 11 ++++++++
.../src/main/resources/infinispan-values.yaml | 14 ++++++++++
5 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
index 6d3072ee..a834521f 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
@@ -101,8 +101,7 @@ public class InfinispanService implements HealthCheck {
.persistence().passivation(false)
.addStore(SingleFileStoreConfigurationBuilder.class)
.shared(false)
- .preload(true)
- .fetchPersistentState(true);
+ .preload(true);
environments = cacheManager.administration().withFlags(CacheContainerAdmin.AdminFlag.VOLATILE).getOrCreateCache(Environment.CACHE, builder.build());
projects = cacheManager.administration().withFlags(CacheContainerAdmin.AdminFlag.VOLATILE).getOrCreateCache(Project.CACHE, builder.build());
files = cacheManager.administration().withFlags(CacheContainerAdmin.AdminFlag.VOLATILE).getOrCreateCache(ProjectFile.CACHE, builder.build());
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index fd526c57..d6791b3b 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -14,14 +14,14 @@ karavan.git-branch=main
karavan.git-pull-interval=disabled
# Infinispan Server address
-#quarkus.infinispan-client.server-list=localhost:12345
+quarkus.infinispan-client.hosts=infinispan.karavan:11222
+quarkus.infinispan-client.username=admin
+quarkus.infinispan-client.password=karavan
+
quarkus.infinispan-client.devservices.enabled=false
quarkus.infinispan-client.devservices.port=12345
quarkus.infinispan-client.devservices.service-name=karavan
quarkus.infinispan-client.health.enabled=false
-# Authentication
-quarkus.infinispan-client.username=admin
-quarkus.infinispan-client.password=password
# Infinispan client intelligence
# Use BASIC as a Docker for Mac workaround
diff --git a/karavan-cli/INFINISPAN.md b/karavan-cli/INFINISPAN.md
new file mode 100644
index 00000000..d5a637ba
--- /dev/null
+++ b/karavan-cli/INFINISPAN.md
@@ -0,0 +1,31 @@
+## Install Karavan with CLI
+
+### Requirements
+1. minikube v1.30+ installed with `--driver=hyperkit`
+
+### Installation
+1. Start minikube
+ ```
+ minikube start --driver=hyperkit
+ ```
+2. Enable registry addon
+ ```
+ minikube addons enable registry
+ ```
+3. Start dashboard (optional)
+ ```
+ minikube dashboard
+ ```
+4. Package karavan-cli
+ ```
+ mvn clean package
+ ```
+5. Install Karavan
+ ```
+ java -jar target/karavan-cli-VERSION.jar install --git-repository=$GIT_REPOSITORY --git-password=$GIT_TOKEN --git-username=$GIT_USERNAME --node-port=30777
+ ```
+5. Get karavan service URL
+ ```
+ minikube service karavan --url --namespace karavan
+ ```
+ Use karavan URL to connect to the application
diff --git a/karavan-cli/src/main/resources/infinispan-secrets.yaml b/karavan-cli/src/main/resources/infinispan-secrets.yaml
new file mode 100644
index 00000000..e2c15bac
--- /dev/null
+++ b/karavan-cli/src/main/resources/infinispan-secrets.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: karavan-infinispan
+type: Opaque
+stringData:
+ username: monitor
+ password: password
+ identities-batch: |-
+ user create admin -p admin -g admin
+ user create monitor -p password --users-file metrics-users.properties --groups-file metrics-groups.properties
diff --git a/karavan-cli/src/main/resources/infinispan-values.yaml b/karavan-cli/src/main/resources/infinispan-values.yaml
new file mode 100644
index 00000000..a59f9635
--- /dev/null
+++ b/karavan-cli/src/main/resources/infinispan-values.yaml
@@ -0,0 +1,14 @@
+images:
+ server: quay.io/infinispan/server:latest
+ initContainer: registry.access.redhat.com/ubi8-micro
+deploy:
+ security:
+ authentication: true
+ secretName: karavan-infinispan
+ replicas: 1
+ container:
+ storage:
+ ephemeral: true
+ expose:
+ type: NodePort
+ nodePort: 32666
\ No newline at end of file