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/05/12 21:54:57 UTC
[camel-karavan] 03/03: Single PVC for cache m2 and jbang #757
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 2920efed2f6b18d2318056f645e402c5b484ba1a
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri May 12 17:52:14 2023 -0400
Single PVC for cache m2 and jbang #757
---
.../apache/camel/karavan/service/KubernetesService.java | 17 ++++++-----------
karavan-runner/Dockerfile | 2 +-
2 files changed, 7 insertions(+), 12 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 d24b776e..77ddaed5 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
@@ -383,8 +383,7 @@ public class KubernetesService implements HealthCheck{
public String tryCreateRunner(Project project, String runnerName) {
- createPVC(runnerName + "-" + JBANG_CACHE_SUFFIX, runnerName);
- createPVC(runnerName + "-" + M2_CACHE_SUFFIX, runnerName);
+ createPVC(runnerName);
Pod old = kubernetesClient().pods().inNamespace(getNamespace()).withName(runnerName).get();
if (old == null) {
ProjectFile properties = infinispanService.getProjectFile(project.getProjectId(), APPLICATION_PROPERTIES_FILENAME);
@@ -444,18 +443,14 @@ public class KubernetesService implements HealthCheck{
.withPorts(port)
.withResources(resources)
.withVolumeMounts(
- new VolumeMountBuilder().withName(name + "-" + JBANG_CACHE_SUFFIX).withMountPath("/karavan/.jbang/cache").build(),
- new VolumeMountBuilder().withName(name + "-" + M2_CACHE_SUFFIX).withMountPath("/karavan/.m2").build())
+ new VolumeMountBuilder().withName(name).withMountPath("/karavan/.jbang/cache").build())
.build();
PodSpec spec = new PodSpecBuilder()
.withTerminationGracePeriodSeconds(0L)
.withContainers(container)
.withVolumes(
- new VolumeBuilder().withName(name + "-" + JBANG_CACHE_SUFFIX)
- .withNewPersistentVolumeClaim(name + "-" + JBANG_CACHE_SUFFIX, false).build(),
- new VolumeBuilder().withName(name + "-" + M2_CACHE_SUFFIX)
- .withNewPersistentVolumeClaim(name + "-" + M2_CACHE_SUFFIX, false).build())
+ new VolumeBuilder().withName(name).withNewPersistentVolumeClaim(name, false).build())
.build();
return new PodBuilder()
@@ -464,12 +459,12 @@ public class KubernetesService implements HealthCheck{
.build();
}
- private void createPVC(String pvcName, String runnerName) {
- PersistentVolumeClaim old = kubernetesClient().persistentVolumeClaims().inNamespace(getNamespace()).withName(pvcName).get();
+ private void createPVC(String runnerName) {
+ PersistentVolumeClaim old = kubernetesClient().persistentVolumeClaims().inNamespace(getNamespace()).withName(runnerName).get();
if (old == null) {
PersistentVolumeClaim pvc = new PersistentVolumeClaimBuilder()
.withNewMetadata()
- .withName(pvcName)
+ .withName(runnerName)
.withNamespace(getNamespace())
.withLabels(getKaravanRunnerLabels(runnerName))
.endMetadata()
diff --git a/karavan-runner/Dockerfile b/karavan-runner/Dockerfile
index d0d65761..e24b703d 100644
--- a/karavan-runner/Dockerfile
+++ b/karavan-runner/Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/jbangdev/jbang-action
ENV CAMEL_VERSION=3.21.0-SNAPSHOT
ENV KARAVAN="/karavan"
-ENV JBANG_REPO="$KARAVAN/.m2"
+ENV JBANG_REPO="$KARAVAN/.jbang/cache/.m2"
ENV JBANG_DIR="$KARAVAN/.jbang"
ENV KAMELETS_DIR="$KARAVAN/kamelets"
ENV CODE_DIR="$KARAVAN/code"