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 2022/09/20 22:11:17 UTC

[camel-karavan] branch main updated (7154a85 -> 53aa1b3)

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 7154a85  Show only Karavan roles
     new e01be4f  Readme
     new a990ce2  Minikube deployment improvement
     new 53aa1b3  Kubernetes client instead of OpenShift

The 3 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/KubernetesService.java   |  2 +-
 karavan-cloud/README.md                            | 31 +++++++++++++++++++---
 karavan-cloud/base/karavan-quarkus-task.yaml       |  2 +-
 .../minikube/karavan-quarkus-task-minikube.yaml    |  2 ++
 4 files changed, 31 insertions(+), 6 deletions(-)


[camel-karavan] 03/03: Kubernetes client instead of OpenShift

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 53aa1b35b26942b919fcdc4cac1722c8256e6475
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Sep 20 18:11:01 2022 -0400

    Kubernetes client instead of OpenShift
---
 .../main/java/org/apache/camel/karavan/service/KubernetesService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index 7cd2851..92a583d 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -198,7 +198,7 @@ public class KubernetesService {
                         ? dsImage.replace("image-registry.openshift-image-registry.svc:5000/", "")
                         : dsImage;
 
-                List<Pod> pods = openshiftClient().pods().inNamespace(namespace)
+                List<Pod> pods = kubernetesClient().pods().inNamespace(namespace)
                         .withLabel("app.kubernetes.io/name", name)
                         .withLabel("app.openshift.io/runtime", "camel")
                         .list().getItems();


[camel-karavan] 02/03: Minikube deployment improvement

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 a990ce2b81baf2964ced9c6619bace243a46ca1c
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Sep 20 18:09:11 2022 -0400

    Minikube deployment improvement
---
 karavan-cloud/README.md                            | 28 +++++++++++++++++-----
 karavan-cloud/base/karavan-quarkus-task.yaml       |  2 +-
 .../minikube/karavan-quarkus-task-minikube.yaml    |  2 ++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/karavan-cloud/README.md b/karavan-cloud/README.md
index d42e8e3..b70b285 100644
--- a/karavan-cloud/README.md
+++ b/karavan-cloud/README.md
@@ -53,18 +53,34 @@
     ```
     minikube addons enable registry
     ```
-3. Set git parameters
-    Edit `karavan-secret.yaml` and set git repository, username and token
+3. Get IP address of internal registry
+    ```
+    kubectl -n kube-system get svc registry -o jsonpath='{.spec.clusterIP}'
+    ```    
+4. Set git parameters
+    Edit `karavan-secret.yaml` and set git repository, username, token and Image Registry IP
+    ```
+    projects-git-repository: https://github.com/xxx
+    projects-git-password: XXXX
+    projects-git-username: XXXX
+    projects-git-main: main
+    kamelets-git-repository: https://github.com/zzz
+    kamelets-git-password: zzz
+    kamelets-git-username: zzz
+    kamelets-git-main: main
+    image-registry: X.X.X.X
+    ```
 
 4. Deploy karavan
     ```
     kubectl apply -k minikube --namespace karavan
     ```
-5. Access Tekton Dashboard 
-    ```
-    kubectl port-forward -n tekton-pipelines service/tekton-dashboard 9097:9097
-    ```
 6. Expose karavan application service
     ```
     minikube service karavan --url --namespace karavan
+    ```
+### Optional
+1.  Access Tekton Dashboard 
+    ```
+    kubectl port-forward -n tekton-pipelines service/tekton-dashboard 9097:9097
     ```
\ No newline at end of file
diff --git a/karavan-cloud/base/karavan-quarkus-task.yaml b/karavan-cloud/base/karavan-quarkus-task.yaml
index b12fa9a..78a6eef 100644
--- a/karavan-cloud/base/karavan-quarkus-task.yaml
+++ b/karavan-cloud/base/karavan-quarkus-task.yaml
@@ -56,7 +56,7 @@ spec:
             -Dquarkus.kubernetes.deploy=true \
             -Dquarkus.openshift.deployment-kind=Deployment \
             -Dquarkus.openshift.add-version-to-label-selectors=false \
-            -Dquarkus.openshift.labels."app.openshift.io/runtime"=camel \
+            -Dquarkus.openshift.labels.\"app.openshift.io/runtime\"=camel \
             -Dquarkus.container-image.group=${NAMESPACE} \
             -Dquarkus.container-image.tag=${DATE}
       image: ghcr.io/apache/camel-karavan-builder:3.18.4
diff --git a/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml b/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
index df2d823..d4e3d56 100644
--- a/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
+++ b/karavan-cloud/minikube/karavan-quarkus-task-minikube.yaml
@@ -53,6 +53,8 @@ spec:
             -Dquarkus.container-image.builder=jib \
             -Dquarkus.kubernetes.deploy=true \
             -Dquarkus.kubernetes.deployment-target=kubernetes \
+            -Dquarkus.kubernetes.add-version-to-label-selectors=false \
+            -Dquarkus.kubernetes.labels.\"app.openshift.io/runtime\"=camel \
             -Dquarkus.container-image.group=${NAMESPACE} \
             -Dquarkus.container-image.tag=${DATE}
       image: ghcr.io/apache/camel-karavan-builder:3.18.4


[camel-karavan] 01/03: Readme

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 e01be4f0c6d835eaa7ff161e1322818836e09b8f
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Sep 20 15:08:34 2022 -0400

    Readme
---
 karavan-cloud/README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/karavan-cloud/README.md b/karavan-cloud/README.md
index c6d4168..d42e8e3 100644
--- a/karavan-cloud/README.md
+++ b/karavan-cloud/README.md
@@ -58,6 +58,13 @@
 
 4. Deploy karavan
     ```
-    kubectl apply -k minikube
+    kubectl apply -k minikube --namespace karavan
     ```
-
+5. Access Tekton Dashboard 
+    ```
+    kubectl port-forward -n tekton-pipelines service/tekton-dashboard 9097:9097
+    ```
+6. Expose karavan application service
+    ```
+    minikube service karavan --url --namespace karavan
+    ```
\ No newline at end of file