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:28 UTC
[camel-karavan] branch main updated (5802d2fd -> d1b3a1e7)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 5802d2fd Fix #814
new 81d4a9bf Fix #815
new d1b3a1e7 Fix #815
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/karavan/service/InfinispanService.java | 3 +-
.../src/main/resources/application.properties | 8 +--
karavan-cli/INFINISPAN.md | 57 ++++++++++++++++++++++
.../src/main/resources/infinispan-secrets.yaml | 11 +++++
.../src/main/resources/infinispan-values.yaml | 14 ++++++
5 files changed, 87 insertions(+), 6 deletions(-)
create mode 100644 karavan-cli/INFINISPAN.md
create mode 100644 karavan-cli/src/main/resources/infinispan-secrets.yaml
create mode 100644 karavan-cli/src/main/resources/infinispan-values.yaml
[camel-karavan] 02/02: Fix #815
Posted by ma...@apache.org.
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 d1b3a1e739d4da0ee390a7cf147b732d389dc992
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Jul 5 08:07:21 2023 -0400
Fix #815
---
.../src/main/resources/application.properties | 2 +-
karavan-cli/INFINISPAN.md | 78 ++++++++++++++--------
2 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index d6791b3b..f4c984f0 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -14,7 +14,7 @@ karavan.git-branch=main
karavan.git-pull-interval=disabled
# Infinispan Server address
-quarkus.infinispan-client.hosts=infinispan.karavan:11222
+#quarkus.infinispan-client.hosts=infinispan.karavan:11222
quarkus.infinispan-client.username=admin
quarkus.infinispan-client.password=karavan
diff --git a/karavan-cli/INFINISPAN.md b/karavan-cli/INFINISPAN.md
index d5a637ba..4f8c7fb8 100644
--- a/karavan-cli/INFINISPAN.md
+++ b/karavan-cli/INFINISPAN.md
@@ -1,31 +1,57 @@
-## Install Karavan with CLI
+## Install Infinispan
+
+More info: https://infinispan.org/docs/helm-chart/main/helm-chart.html
### Requirements
1. minikube v1.30+ installed with `--driver=hyperkit`
+2. `helm` client
### 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
+1. Add the OpenShift Helm Charts repository
+ ```
+ $ helm repo add openshift-helm-charts https://charts.openshift.io/
+ ```
+2. Create a secrets, ex `infinispan-secrets.yaml`:
+```
+apiVersion: v1
+kind: Secret
+metadata:
+ name: karavan-infinispan
+type: Opaque
+stringData:
+ username: monitor
+ password: password
+ identities-batch: |-
+ user create admin -p karavan -g admin
+ user create monitor -p password --users-file metrics-users.properties --groups-file metrics-groups.properties
+```
+4. Apply secret
+ ```
+ kubectl apply -f infinispan-secrets.yaml
+ ```
+5. Create a values file that configures your Infinispan cluster, ex `infinispan-values.yaml`:
+ ```
+ 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
+ ```
+5. Install the Infinispan chart and specify your values file
+ ```
+ kubectl config set-context --current --namespace=karavan
+ helm install infinispan openshift-helm-charts/infinispan-infinispan --values infinispan-values.yaml
+ ```
+6. Configure hosts for `karavan-app` in `application.properties`:
+ ```
+ quarkus.infinispan-client.hosts=infinispan.karavan:11222
+ ```
[camel-karavan] 01/02: Fix #815
Posted by ma...@apache.org.
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