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 9dc40f51 First prototype for #804
9dc40f51 is described below
commit 9dc40f51e1e136a811a93e9d1e33356687b2b668
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Wed Jun 21 11:08:41 2023 -0400
First prototype for #804
---
.../java/org/apache/camel/karavan/service/KubernetesService.java | 4 ++++
karavan-builder/Dockerfile | 5 ++++-
.../src/main/java/org/apache/camel/karavan/cli/Constants.java | 1 +
.../java/org/apache/camel/karavan/cli/resources/KaravanTekton.java | 3 +++
karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh | 2 +-
karavan-cli/src/main/resources/quarkus-builder-script-openshift.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-kubernetes.sh | 2 +-
.../src/main/resources/spring-boot-builder-script-openshift.sh | 2 +-
8 files changed, 16 insertions(+), 5 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 2e5d8c53..368d938d 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
@@ -61,6 +61,7 @@ public class KubernetesService implements HealthCheck{
private static final String KARAVAN_PREFIX = "karavan";
private static final String JBANG_CACHE_SUFFIX = "jbang-cache";
private static final String M2_CACHE_SUFFIX = "m2-cache";
+ public static final String PVC_MAVEN_SETTINGS = "maven-settings";
@Inject
EventBus eventBus;
@@ -171,6 +172,9 @@ public class KubernetesService implements HealthCheck{
.withServiceAccountName("pipeline")
.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").build()).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)
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index d4416286..28190786 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -1,5 +1,8 @@
FROM jbangdev/jbang-action:0.106.1
+ENV CAMEL_VERSION=3.20.6
+ENV MAVEN_SETTINGS="/karavan/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
@@ -7,4 +10,4 @@ RUN jbang trust add -o --fresh --quiet
https://github.com/apache/camel/blob/HEAD
RUN apt-get update -y && apt-get install maven git -y && apt-get clean
WORKDIR /scripts
-ENTRYPOINT ["entrypoint", "-Dcamel.jbang.version=3.20.6", "camel@apache/camel"]
+ENTRYPOINT ["entrypoint"]
diff --git
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/Constants.java
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/Constants.java
index ce83af9f..061105d2 100644
--- a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/Constants.java
+++ b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/Constants.java
@@ -41,6 +41,7 @@ public final class Constants {
public static final String ROLEBINDING_KARAVAN = "karavan";
public static final String ROLEBINDING_KARAVAN_VIEW = "karavan-view";
public static final String PVC_DATA = "karavan-data";
+ public static final String PVC_MAVEN_SETTINGS = "maven-settings";
public static final String PVC_M2_CACHE = "karavan-m2-cache";
public static final String PVC_JBANG_CACHE = "karavan-jbang-cache";
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 8673a4fd..fb8586e3 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,6 +69,7 @@ public class KaravanTekton {
.build()
)
.withWorkspaces(
+ new WorkspaceDeclaration("Maven Settings",
"/karavan/maven-settings.xml", 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)
)
@@ -114,12 +115,14 @@ public class KaravanTekton {
.withParams(new
ParamBuilder().withName("project").withNewValue("$(params.PROJECT_ID)").build())
.withTaskRef(new
TaskRefBuilder().withKind("Task").withName(taskName).build())
.withWorkspaces(
+ new
WorkspacePipelineTaskBinding(Constants.PVC_MAVEN_SETTINGS, "",
Constants.PVC_MAVEN_SETTINGS),
new
WorkspacePipelineTaskBinding(Constants.PVC_M2_CACHE, "",
Constants.PVC_M2_CACHE),
new
WorkspacePipelineTaskBinding(Constants.PVC_JBANG_CACHE, "",
Constants.PVC_JBANG_CACHE)
)
.build()
)
.withWorkspaces(
+ new PipelineWorkspaceDeclaration("Maven Settings",
Constants.PVC_MAVEN_SETTINGS, false),
new PipelineWorkspaceDeclaration("Maven Cache",
Constants.PVC_M2_CACHE, false),
new PipelineWorkspaceDeclaration("JBang Cache",
Constants.PVC_JBANG_CACHE, 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 14b3f5fa..00210039 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -14,7 +14,7 @@ fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
-entrypoint -Dcamel.jbang.version=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
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 cd0638cf..f5f48100 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=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
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 aa49c1ec..0373e6de 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=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
--maven-settings=$MAVEN_SETTINGS
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
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 431d4ea6..f5b8a9fe 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=3.20.6 camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+entrypoint -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR} --maven-settings=$MAVEN_SETTINGS
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
