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 30d5ffa3 First prototype for #804
30d5ffa3 is described below
commit 30d5ffa3d7c218499d4b5dad517b1cac65353f74
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Wed Jun 21 13:35:21 2023 -0400
First prototype for #804
---
.../org/apache/camel/karavan/service/KubernetesService.java | 10 +++-------
karavan-builder/Dockerfile | 2 +-
.../org/apache/camel/karavan/cli/resources/KaravanTekton.java | 2 +-
.../src/main/resources/quarkus-builder-script-kubernetes.sh | 11 +++++++++--
.../src/main/resources/quarkus-builder-script-openshift.sh | 5 +++--
.../main/resources/spring-boot-builder-script-kubernetes.sh | 5 +++--
.../main/resources/spring-boot-builder-script-openshift.sh | 5 +++--
karavan-runner/Dockerfile | 2 +-
8 files changed, 24 insertions(+), 18 deletions(-)
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 37181108..f401a991 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
@@ -173,10 +173,7 @@ public class KubernetesService implements HealthCheck{
.withParams(new
ParamBuilder().withName("PROJECT_ID").withNewValue(project.getProjectId()).build())
.withWorkspaces(
new
WorkspaceBindingBuilder().withName(PVC_MAVEN_SETTINGS)
- .withConfigMap(new
ConfigMapVolumeSourceBuilder().withName("karavan")
- .withItems(new KeyToPathBuilder()
- .withKey("maven-settings")
-
.withPath("maven-settings").build()).build()).build(),
+ .withConfigMap(new
ConfigMapVolumeSourceBuilder().withName("karavan").build()).build(),
new WorkspaceBindingBuilder().withName(KARAVAN_PREFIX
+ "-" + M2_CACHE_SUFFIX)
.withNewPersistentVolumeClaim(KARAVAN_PREFIX +
"-" + M2_CACHE_SUFFIX, false).build(),
new WorkspaceBindingBuilder().withName(KARAVAN_PREFIX
+ "-" + JBANG_CACHE_SUFFIX)
@@ -454,9 +451,8 @@ public class KubernetesService implements HealthCheck{
.withResources(resources)
.withImagePullPolicy("Always")
.withVolumeMounts(
- new VolumeMountBuilder().withName("maven-settings")
- .withMountPath("/karavan/maven-settings.xml")
- .withSubPath("maven-settings").build())
+ new
VolumeMountBuilder().withName("maven-settings").withSubPath("maven-settings")
+
.withMountPath("/karavan-config-map/maven-settings.xml").build())
.build();
PodSpec spec = new PodSpecBuilder()
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index 28190786..2ba9bdcb 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -1,7 +1,7 @@
FROM jbangdev/jbang-action:0.106.1
ENV CAMEL_VERSION=3.20.6
-ENV MAVEN_SETTINGS="/karavan/maven-settings.xml"
+ENV MAVEN_SETTINGS="/karavan-config-map/maven-settings.xml"
# Add Camel-JBang
RUN jbang trust add -o --fresh --quiet
https://github.com/apache/camel/blob/HEAD/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
diff --git
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanTekton.java
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanTekton.java
index fb8586e3..0c7a8f5a 100644
---
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanTekton.java
+++
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanTekton.java
@@ -69,7 +69,7 @@ public class KaravanTekton {
.build()
)
.withWorkspaces(
- new WorkspaceDeclaration("Maven Settings",
"/karavan/maven-settings.xml", Constants.PVC_MAVEN_SETTINGS, false, false),
+ new WorkspaceDeclaration("Maven Settings",
"/karavan-config-map", Constants.PVC_MAVEN_SETTINGS, false, false),
new WorkspaceDeclaration("Maven Cache", "/root/.m2",
Constants.PVC_M2_CACHE, false, false),
new WorkspaceDeclaration("JBang Cache",
"/jbang/.jbang/cache", Constants.PVC_JBANG_CACHE, false, false)
)
diff --git
a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
index 00210039..73b5165d 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -2,6 +2,12 @@
CHECKOUT_DIR="/scripts"
KAMELETS_DIR="/scripts/kamelets"
+env
+
+ls -la /karavan/maven-settings.xml
+
+cat /karavan/maven-settings.xml/maven-settings
+
if [[ $GIT_REPOSITORY == https* ]] ;
then
replacer=https://$GIT_PASSWORD@
@@ -14,7 +20,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
@@ -35,4 +41,5 @@ mvn package \
-Dquarkus.kubernetes.labels.\"app\"=$(inputs.params.project) \
-Dquarkus.kubernetes.labels.\"app.kubernetes.io/runtime\"=camel \
-Dquarkus.container-image.group=${IMAGE_GROUP} \
- -Dquarkus.container-image.tag=${DATE}
\ No newline at end of file
+ -Dquarkus.container-image.tag=${DATE} \
+ --settings=$MAVEN_SETTINGS
\ No newline at end of file
diff --git a/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
b/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
index f5f48100..3955735c 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
@@ -37,4 +37,5 @@ mvn package \
-Dquarkus.openshift.labels.\"app\"=$(inputs.params.project) \
-Dquarkus.openshift.labels.\"app.openshift.io/runtime\"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
- -Dquarkus.container-image.tag=${DATE}
\ No newline at end of file
+ -Dquarkus.container-image.tag=${DATE} \
+ --settings=$MAVEN_SETTINGS
\ No newline at end of file
diff --git
a/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
b/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
index 0373e6de..029ca26c 100644
--- a/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
--maven-settings=$MAVEN_SETTINGS
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
@@ -27,4 +27,5 @@ mvn package k8s:build k8s:push k8s:resource k8s:apply \
-Djkube.docker.push.registry=${IMAGE_REGISTRY} \
-Djkube.docker.username=${IMAGE_REGISTRY_USERNAME} \
-Djkube.docker.password=${IMAGE_REGISTRY_PASSWORD} \
-
-Djkube.generator.name=${IMAGE_REGISTRY}/${IMAGE_GROUP}/$(inputs.params.project):${DATE}
\ No newline at end of file
+
-Djkube.generator.name=${IMAGE_REGISTRY}/${IMAGE_GROUP}/$(inputs.params.project):${DATE}
\
+ --settings=$MAVEN_SETTINGS
\ No newline at end of file
diff --git
a/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
b/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
index f5b8a9fe..2e904a6c 100644
--- a/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
+++ b/karavan-cli/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
@@ -25,4 +25,5 @@ mvn package package oc:build oc:push oc:resource oc:apply \
-Popenshift \
-Djkube.namespace=${NAMESPACE} \
-Djkube.docker.push.registry=${IMAGE_REGISTRY} \
-
-Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$(inputs.params.project):${DATE}
+
-Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$(inputs.params.project):${DATE}
\
+ --settings=$MAVEN_SETTINGS
\ No newline at end of file
diff --git a/karavan-runner/Dockerfile b/karavan-runner/Dockerfile
index 94a5bf31..0cbaebea 100644
--- a/karavan-runner/Dockerfile
+++ b/karavan-runner/Dockerfile
@@ -1,7 +1,7 @@
FROM jbangdev/jbang-action:0.106.1
ENV CAMEL_VERSION=3.20.6
-ENV MAVEN_SETTINGS="/karavan/maven-settings.xml"
+ENV MAVEN_SETTINGS="/karavan-config-map/maven-settings.xml"
ENV KAMELETS_DIR="/scripts/kamelets"
ENV CODE_DIR="/scripts/code"
