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 4f31dd98 Fix #512
4f31dd98 is described below
commit 4f31dd98ee2f0e9be102fb7aa21abb3943048b68
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Jun 19 10:49:27 2023 -0400
Fix #512
---
.../org/apache/camel/karavan/cli/KaravanCli.java | 9 +++++---
.../apache/camel/karavan/cli/KaravanConfig.java | 14 ++++++++++--
.../camel/karavan/cli/resources/KaravanSecret.java | 25 ++++++++++++----------
.../camel/karavan/cli/resources/KaravanTekton.java | 8 ++++++-
.../resources/quarkus-builder-script-kubernetes.sh | 8 +++----
.../spring-boot-builder-script-kubernetes.sh | 4 +++-
6 files changed, 46 insertions(+), 22 deletions(-)
diff --git
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanCli.java
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanCli.java
index 11e9e874..75713e02 100644
--- a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanCli.java
+++ b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanCli.java
@@ -56,11 +56,13 @@ public class KaravanCli implements Callable<Integer> {
private String gitBranch;
@CommandLine.Option(names = {"--git-pull"}, description = "Git pull
interval. Default: off", defaultValue = "off")
private String gitPullInterval;
- @CommandLine.Option(names = {"--registry"}, description = "Image registry")
+ @CommandLine.Option(names = {"--image-registry"}, description = "Image
registry")
private String imageRegistry;
- @CommandLine.Option(names = {"--registry-username"}, description = "Image
registry username")
+ @CommandLine.Option(names = {"--image-group"}, description = "Image group")
+ private String imageGroup;
+ @CommandLine.Option(names = {"--image-registry-username"}, description =
"Image registry username")
private String imageRegistryUsername;
- @CommandLine.Option(names = {"--registry-password"}, description = "Image
registry password")
+ @CommandLine.Option(names = {"--image-registry-password"}, description =
"Image registry password")
private String imageRegistryPassword;
@CommandLine.Option(names = { "-h", "--help" }, usageHelp = true,
description = "Display help")
@@ -90,6 +92,7 @@ public class KaravanCli implements Callable<Integer> {
gitBranch,
gitPullInterval,
imageRegistry,
+ imageGroup,
imageRegistryUsername,
imageRegistryPassword
);
diff --git
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanConfig.java
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanConfig.java
index 4c143601..320e856f 100644
--- a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanConfig.java
+++ b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/KaravanConfig.java
@@ -43,6 +43,7 @@ public class KaravanConfig {
private String gitBranch;
private String gitPullInterval;
private String imageRegistry;
+ private String imageGroup;
private String imageRegistryUsername;
private String imageRegistryPassword;
@@ -50,8 +51,8 @@ public class KaravanConfig {
int nodePort, int instances, String baseImage, String
baseBuilderImage, boolean isOpenShift,
Map<String, String> labels, String masterPassword,
String oidcSecret, String oidcServerUrl,
String oidcFrontendUrl, String gitRepository, String
gitUsername, String gitPassword,
- String gitBranch, String gitPullInterval, String
imageRegistry, String imageRegistryUsername,
- String imageRegistryPassword) {
+ String gitBranch, String gitPullInterval, String
imageRegistry, String imageGroup,
+ String imageRegistryUsername, String
imageRegistryPassword) {
this.version = version;
this.namespace = namespace;
this.environment = environment;
@@ -73,6 +74,7 @@ public class KaravanConfig {
this.gitBranch = gitBranch;
this.gitPullInterval = gitPullInterval;
this.imageRegistry = imageRegistry;
+ this.imageGroup = imageGroup;
this.imageRegistryUsername = imageRegistryUsername;
this.imageRegistryPassword = imageRegistryPassword;
}
@@ -281,4 +283,12 @@ public class KaravanConfig {
public void setImageRegistryPassword(String imageRegistryPassword) {
this.imageRegistryPassword = imageRegistryPassword;
}
+
+ public String getImageGroup() {
+ return imageGroup;
+ }
+
+ public void setImageGroup(String imageGroup) {
+ this.imageGroup = imageGroup;
+ }
}
diff --git
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanSecret.java
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanSecret.java
index 71eba64f..aba82ead 100644
---
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanSecret.java
+++
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanSecret.java
@@ -21,23 +21,26 @@ import org.apache.camel.karavan.cli.Constants;
import org.apache.camel.karavan.cli.KaravanConfig;
import org.apache.camel.karavan.cli.ResourceUtils;
+import java.util.HashMap;
import java.util.Map;
public class KaravanSecret {
public static Secret getSecret(KaravanConfig config) {
- Map<String, String> secretData = Map.of(
- "master-password", (config.isAuthBasic() ?
config.getMasterPassword() : "karavan"),
- "oidc-secret", (config.isAuthOidc() ? config.getOidcSecret() :
"xxx"),
- "oidc-server-url", (config.isAuthOidc() ?
config.getOidcServerUrl() :"https://localhost/auth/realms/karavan";),
- "oidc-frontend-url", (config.isAuthOidc() ?
config.getOidcFrontendUrl() : "https://localhost/auth";),
- "git-repository", config.getGitRepository(),
- "git-password", config.getGitPassword(),
- "git-username", config.getGitUsername(),
- "git-branch", config.getGitBranch(),
- "image-registry", config.getImageRegistry()
- );
+ Map<String, String> secretData = new HashMap<>();
+ secretData.put("master-password", (config.isAuthBasic() ?
config.getMasterPassword() : "karavan"));
+ secretData.put("oidc-secret", (config.isAuthOidc() ?
config.getOidcSecret() : "xxx"));
+ secretData.put("oidc-server-url", (config.isAuthOidc() ?
config.getOidcServerUrl() : "https://localhost/auth/realms/karavan";));
+ secretData.put("oidc-frontend-url", (config.isAuthOidc() ?
config.getOidcFrontendUrl() : "https://localhost/auth";));
+ secretData.put("git-repository", config.getGitRepository());
+ secretData.put("git-password", config.getGitPassword());
+ secretData.put("git-username", config.getGitUsername());
+ secretData.put("git-branch", config.getGitBranch());
+ secretData.put("image-registry", config.getImageRegistry());
+ secretData.put("image-group", config.getImageGroup());
+ secretData.put("image-registry-username",
config.getImageRegistryUsername());
+ secretData.put("image-registry-password",
config.getImageRegistryPassword());
return new SecretBuilder()
.withNewMetadata()
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 14a31246..8673a4fd 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
@@ -58,7 +58,13 @@ public class KaravanTekton {
new
EnvVarBuilder().withName("GIT_BRANCH").withValueFrom(
new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("git-branch").and().build()).build(),
new
EnvVarBuilder().withName("IMAGE_REGISTRY").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry").withOptional(true).and().build()).build()
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry").withOptional(true).and().build()).build(),
+ new
EnvVarBuilder().withName("IMAGE_GROUP").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-group").withOptional(true).and().build()).build(),
+ new
EnvVarBuilder().withName("IMAGE_REGISTRY_USERNAME").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry-username").withOptional(true).and().build()).build(),
+ new
EnvVarBuilder().withName("IMAGE_REGISTRY_PASSWORD").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry-password").withOptional(true).and().build()).build()
)
.build()
)
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 844f8407..ba73efb5 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -19,14 +19,14 @@ entrypoint -Dcamel.jbang.version=3.20.5 camel@apache/camel
export --local-kamele
export LAST_COMMIT=$(git rev-parse --short HEAD)
export DATE=$(date '+%Y%m%d%H%M%S')
export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace
mvn package \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.insecure=true \
- -Dquarkus.container-image.username=sa \
- -Dquarkus.container-image.password=${TOKEN} \
+ -Dquarkus.container-image.username=${IMAGE_REGISTRY_USERNAME} \
+ -Dquarkus.container-image.password=${IMAGE_REGISTRY_PASSWORD} \
-Dquarkus.container-image.registry=${IMAGE_REGISTRY} \
-Dquarkus.container-image.builder=jib \
-Dquarkus.kubernetes.deploy=true \
@@ -34,5 +34,5 @@ mvn package \
-Dquarkus.kubernetes.add-version-to-label-selectors=false \
-Dquarkus.kubernetes.labels.\"app\"=$(inputs.params.project) \
-Dquarkus.kubernetes.labels.\"app.kubernetes.io/runtime\"=camel \
- -Dquarkus.container-image.group=${NAMESPACE} \
+ -Dquarkus.container-image.group=${IMAGE_GROUP} \
-Dquarkus.container-image.tag=${DATE}
\ 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 2e860889..c76078a5 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
@@ -25,4 +25,6 @@ mvn package k8s:build k8s:push k8s:resource k8s:apply \
-Pkubernetes \
-Djkube.namespace=${NAMESPACE} \
-Djkube.docker.push.registry=${IMAGE_REGISTRY} \
-
-Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$(inputs.params.project):${DATE}
\ No newline at end of file
+ -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
