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/12/15 16:26:47 UTC
(camel-karavan) branch main updated: Fix #1032
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 82878a7d Fix #1032
82878a7d is described below
commit 82878a7d26331d15091d827cf754e260ee9effb0
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Dec 15 11:26:34 2023 -0500
Fix #1032
---
.../karavan/kubernetes/KubernetesService.java | 25 ++++++++++++++--------
.../org/apache/camel/karavan/shared/Constants.java | 3 +--
.../src/main/resources/application.properties | 3 +++
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index d3123d13..a2e2c49d 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -84,9 +84,15 @@ public class KubernetesService implements HealthCheck {
@ConfigProperty(name = "karavan.devmode.image")
public String devmodeImage;
+ @ConfigProperty(name = "karavan.devmode.service.account")
+ public String devModeServiceAccount;
+
@ConfigProperty(name = "karavan.devmode.create-pvc")
public Boolean devmodePVC;
+ @ConfigProperty(name = "karavan.builder.service.account")
+ public String builderServiceAccount;
+
@ConfigProperty(name = "karavan.version")
String version;
@@ -223,28 +229,28 @@ public class KubernetesService implements HealthCheck {
});
envVars.add(
- new EnvVar("IMAGE_REGISTRY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_REGISTRY_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-username", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-username", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_REGISTRY_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-password", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-password", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_GROUP", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-group", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_GROUP", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-group", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("GIT_REPOSITORY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-repository", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("GIT_REPOSITORY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-repository", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("GIT_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-username", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("GIT_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-username", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("GIT_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-password", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("GIT_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-password", SECRET_NAME, false)).build())
);
envVars.add(
- new EnvVar("GIT_BRANCH", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-branch", KARAVAN_SECRET_NAME, false)).build())
+ new EnvVar("GIT_BRANCH", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-branch", SECRET_NAME, false)).build())
);
ObjectMeta meta = new ObjectMetaBuilder()
@@ -275,7 +281,7 @@ public class KubernetesService implements HealthCheck {
.withTerminationGracePeriodSeconds(0L)
.withContainers(container)
.withRestartPolicy("Never")
- .withServiceAccount(KARAVAN_SERVICE_ACCOUNT)
+ .withServiceAccount(builderServiceAccount)
.withVolumes(
new VolumeBuilder().withName(BUILD_CONFIG_MAP)
.withConfigMap(new ConfigMapVolumeSourceBuilder().withName(BUILD_CONFIG_MAP).withItems(
@@ -481,6 +487,7 @@ public class KubernetesService implements HealthCheck {
.withContainers(container)
.withRestartPolicy("Never")
.withVolumes(volumes)
+ .withServiceAccount(devModeServiceAccount)
.build();
return new PodBuilder()
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
index 72ea919d..ffb531ab 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
@@ -31,8 +31,7 @@ public class Constants {
public static final String BUILDER_SUFFIX = "-builder";
public static final String CAMEL_PREFIX = "camel";
- public static final String KARAVAN_SECRET_NAME = "karavan";
- public static final String KARAVAN_SERVICE_ACCOUNT = "karavan";
+ public static final String SECRET_NAME = "karavan";
public static final String KARAVAN_PREFIX = "karavan";
public static final String JBANG_CACHE_SUFFIX = "jbang-cache";
public static final String M2_CACHE_SUFFIX = "m2-cache";
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties b/karavan-web/karavan-app/src/main/resources/application.properties
index eaef7a99..e8564db5 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -27,6 +27,9 @@ karavan.container.statistics.interval=10s
# karavan.container.statistics.interval should be off in kubernetes
karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.1.0
+karavan.devmode.create-pvc=false
+karavan.devmode.service.account=karavan
+karavan.builder.service.account=karavan
karavan.maven.cache=
karavan.docker.network=karavan