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 2024/01/03 22:41:22 UTC
(camel-karavan) branch main updated: Fix #1043
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 ee5a7e80 Fix #1043
ee5a7e80 is described below
commit ee5a7e80b33cbfe1442d99a9affce557bd654fef
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Jan 3 17:41:14 2024 -0500
Fix #1043
---
.../karavan/kubernetes/KubernetesService.java | 24 +++++++++++-----------
.../org/apache/camel/karavan/shared/Constants.java | 1 -
.../src/main/resources/application.properties | 1 +
.../karavan-app/src/main/webui/package-lock.json | 2 +-
4 files changed, 14 insertions(+), 14 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 ca7ca032..b41a4d1e 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
@@ -93,8 +93,8 @@ public class KubernetesService implements HealthCheck {
@ConfigProperty(name = "karavan.builder.service.account")
public String builderServiceAccount;
- @ConfigProperty(name = "karavan.version")
- String version;
+ @ConfigProperty(name = "karavan.secret.name", defaultValue = "karavan")
+ String secretName;
List<SharedIndexInformer> informers = new ArrayList<>(INFORMERS);
@@ -230,28 +230,28 @@ public class KubernetesService implements HealthCheck {
});
envVars.add(
- new EnvVar("IMAGE_REGISTRY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry", SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry", secretName, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_REGISTRY_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-username", SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-username", secretName, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_REGISTRY_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-password", SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_REGISTRY_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-registry-password", secretName, false)).build())
);
envVars.add(
- new EnvVar("IMAGE_GROUP", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-group", SECRET_NAME, false)).build())
+ new EnvVar("IMAGE_GROUP", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("image-group", secretName, false)).build())
);
envVars.add(
- new EnvVar("GIT_REPOSITORY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-repository", SECRET_NAME, false)).build())
+ new EnvVar("GIT_REPOSITORY", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-repository", secretName, false)).build())
);
envVars.add(
- new EnvVar("GIT_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-username", SECRET_NAME, false)).build())
+ new EnvVar("GIT_USERNAME", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-username", secretName, false)).build())
);
envVars.add(
- new EnvVar("GIT_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-password", SECRET_NAME, false)).build())
+ new EnvVar("GIT_PASSWORD", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-password", secretName, false)).build())
);
envVars.add(
- new EnvVar("GIT_BRANCH", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-branch", SECRET_NAME, false)).build())
+ new EnvVar("GIT_BRANCH", null, new EnvVarSourceBuilder().withSecretKeyRef(new SecretKeySelector("git-branch", secretName, false)).build())
);
ObjectMeta meta = new ObjectMetaBuilder()
@@ -558,13 +558,13 @@ public class KubernetesService implements HealthCheck {
public Secret getKaravanSecret() {
try (KubernetesClient client = kubernetesClient()) {
- return client.secrets().inNamespace(getNamespace()).withName("karavan").get();
+ return client.secrets().inNamespace(getNamespace()).withName(secretName).get();
}
}
public String getKaravanSecret(String key) {
try (KubernetesClient client = kubernetesClient()) {
- Secret secret = client.secrets().inNamespace(getNamespace()).withName("karavan").get();
+ Secret secret = client.secrets().inNamespace(getNamespace()).withName(secretName).get();
Map<String, String> data = secret.getData();
return decodeSecret(data.get(key));
}
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 b67bd6b4..48520dc8 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,7 +31,6 @@ public class Constants {
public static final String BUILDER_SUFFIX = "-builder";
public static final String CAMEL_PREFIX = "camel";
- 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 97723470..1dbd6f3e 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -30,6 +30,7 @@ karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.3.1
karavan.devmode.create-pvc=false
karavan.devmode.service.account=karavan
karavan.builder.service.account=karavan
+karavan.secret.name=karavan
karavan.maven.cache=
karavan.docker.network=karavan
diff --git a/karavan-web/karavan-app/src/main/webui/package-lock.json b/karavan-web/karavan-app/src/main/webui/package-lock.json
index 67f8f5ab..b4f99745 100644
--- a/karavan-web/karavan-app/src/main/webui/package-lock.json
+++ b/karavan-web/karavan-app/src/main/webui/package-lock.json
@@ -54,7 +54,7 @@
}
},
"../../../../../karavan-core": {
- "version": "4.3.0",
+ "version": "4.3.1",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.7",