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 2022/10/13 23:01:51 UTC
[camel-karavan] 02/02: Fix branch parameter name
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 54963ab156cfaf2c4a37dd8a70fdbddee17945c3
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Oct 13 19:01:41 2022 -0400
Fix branch parameter name
---
.../org/apache/camel/karavan/model/GitConfig.java | 14 ++++++------
.../apache/camel/karavan/service/GitService.java | 26 +++++++++++-----------
.../src/main/resources/application.properties | 4 ++--
karavan-cloud/karavan-secret.yaml | 19 ++++++++++++++++
.../apache/camel/karavan/KaravanTektonTask.java | 8 +++----
.../resources/karavan-quarkus-builder-script.sh | 8 +++----
6 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java b/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
index 2a5ac15..580c645 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
@@ -4,13 +4,13 @@ public class GitConfig {
private String uri;
private String username;
private String password;
- private String mainBranch;
+ private String branch;
- public GitConfig(String uri, String username, String password, String mainBranch) {
+ public GitConfig(String uri, String username, String password, String branch) {
this.uri = uri;
this.username = username;
this.password = password;
- this.mainBranch = mainBranch;
+ this.branch = branch;
}
public String getUri() {
@@ -37,11 +37,11 @@ public class GitConfig {
this.password = password;
}
- public String getMainBranch() {
- return mainBranch;
+ public String getBranch() {
+ return branch;
}
- public void setMainBranch(String mainBranch) {
- this.mainBranch = mainBranch;
+ public void setBranch(String branch) {
+ this.branch = branch;
}
}
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index e2e1490..94321c0 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -74,22 +74,22 @@ public class GitService {
private GitConfig getGitConfig(String name) {
String propertiesPrefix = "karavan." + name + "-";
- String mainBranch = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-main", String.class);
+ String branch = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-branch", String.class);
if (kubernetesService.inKubernetes()){
String kubernetesPrefix = name + "-";
Secret secret = kubernetesService.getKaravanSecret();
String uri = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-repository").getBytes(StandardCharsets.UTF_8)));
String username = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-username").getBytes(StandardCharsets.UTF_8)));
String password = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-password").getBytes(StandardCharsets.UTF_8)));
- if (secret.getData().containsKey(kubernetesPrefix + "git-main")){
- mainBranch = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-main").getBytes(StandardCharsets.UTF_8)));
+ if (secret.getData().containsKey(kubernetesPrefix + "git-branch")){
+ branch = new String(Base64.getDecoder().decode(secret.getData().get(kubernetesPrefix + "git-branch").getBytes(StandardCharsets.UTF_8)));
}
- return new GitConfig(uri, username, password, mainBranch);
+ return new GitConfig(uri, username, password, branch);
} else {
String uri = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-repository", String.class);
String username = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-username", String.class);
String password = ConfigProvider.getConfig().getValue(propertiesPrefix + "git-password", String.class);
- return new GitConfig(uri, username, password, mainBranch);
+ return new GitConfig(uri, username, password, branch);
}
}
@@ -102,17 +102,17 @@ public class GitService {
LOGGER.infof("Temp folder created: {}", folder);
Git git = null;
try {
- git = clone(folder, gitConfig.getUri(), gitConfig.getMainBranch(), cred);
- checkout(git, false, null, null, gitConfig.getMainBranch());
+ git = clone(folder, gitConfig.getUri(), gitConfig.getBranch(), cred);
+ checkout(git, false, null, null, gitConfig.getBranch());
} catch (RefNotFoundException e) {
LOGGER.error("New repository");
- git = init(folder, gitConfig.getUri(), gitConfig.getMainBranch());
+ git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
} catch (Exception e) {
LOGGER.error("Error", e);
}
writeProjectToFolder(folder, project, files);
addDeletedFilesToIndex(git, folder, project, files);
- return commitAddedAndPush(git, gitConfig.getMainBranch(), cred).getId().getName();
+ return commitAddedAndPush(git, gitConfig.getBranch(), cred).getId().getName();
}
public List<Tuple2<String, String>> readKameletsFromRepository() {
@@ -123,8 +123,8 @@ public class GitService {
String folder = vertx.fileSystem().createTempDirectoryBlocking(uuid);
LOGGER.infof("Temp folder created: %s", folder);
try {
- Git git = clone(folder, gitConfig.getUri(), gitConfig.getMainBranch(), cred);
- checkout(git, false, null, null, gitConfig.getMainBranch());
+ Git git = clone(folder, gitConfig.getUri(), gitConfig.getBranch(), cred);
+ checkout(git, false, null, null, gitConfig.getBranch());
return readKameletsFromFolder(folder);
} catch (RefNotFoundException e) {
LOGGER.error("New repository");
@@ -145,8 +145,8 @@ public class GitService {
List<Tuple2<String, Map<String, String>>> result = new ArrayList<>();
Git git = null;
try {
- git = clone(folder, gitConfig.getUri(), gitConfig.getMainBranch(), cred);
- checkout(git, false, null, null, gitConfig.getMainBranch());
+ git = clone(folder, gitConfig.getUri(), gitConfig.getBranch(), cred);
+ checkout(git, false, null, null, gitConfig.getBranch());
List<String> projects = readProjectsFromFolder(folder);
projects.forEach(project -> {
Map<String, String> files = readProjectFilesFromFolder(folder, project);
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index a527351..56914df 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -4,13 +4,13 @@ karavan.version=3.18.5
karavan.projects-git-repository=${GIT_REPOSITORY}
karavan.projects-git-username=${GIT_USERNAME}
karavan.projects-git-password=${GIT_TOKEN}
-karavan.projects-git-main=main
+karavan.projects-git-branch=main
# Git repository Configuration for custom Kamelets
karavan.kamelets-git-repository=${KAMELETS_GIT_REPOSITORY}
karavan.kamelets-git-username=${GIT_USERNAME}
karavan.kamelets-git-password=${GIT_TOKEN}
-karavan.kamelets-git-main=main
+karavan.kamelets-git-branch=main
# Projects configuration
karavan.config.group-id=org.camel.karavan.demo
diff --git a/karavan-cloud/karavan-secret.yaml b/karavan-cloud/karavan-secret.yaml
new file mode 100644
index 0000000..3447398
--- /dev/null
+++ b/karavan-cloud/karavan-secret.yaml
@@ -0,0 +1,19 @@
+kind: Secret
+apiVersion: v1
+metadata:
+ name: karavan
+type: Opaque
+stringData:
+ master-password: karavan
+ oidc-secret: XXXXX
+ oidc-server-url: https://localhost/auth/realms/karavan
+ oidc-frontend-url: https://localhost/auth
+ projects-git-repository: https://github.com/mgubaidullin/karavan-demo.git
+ projects-git-password: demo
+ projects-git-username: demo
+ projects-git-branch: main
+ kamelets-git-repository: https://github.com/mgubaidullin/karavan-demo-kamelets.git
+ kamelets-git-password: demo
+ kamelets-git-username: demo
+ kamelets-git-branch: main
+ image-registry: image-registry.openshift-image-registry.svc:5000
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/KaravanTektonTask.java b/karavan-operator/src/main/java/org/apache/camel/karavan/KaravanTektonTask.java
index cc7de42..d911bfa 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/KaravanTektonTask.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/KaravanTektonTask.java
@@ -63,16 +63,16 @@ public class KaravanTektonTask extends CRUDKubernetesDependentResource<Task, Kar
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-username").and().build()).build(),
new EnvVarBuilder().withName("PROJECTS_GIT_PASSWORD").withValueFrom(
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-password").and().build()).build(),
- new EnvVarBuilder().withName("PROJECTS_GIT_MAIN").withValueFrom(
- new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-main").and().build()).build(),
+ new EnvVarBuilder().withName("PROJECTS_GIT_BRANCH").withValueFrom(
+ new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-branch").and().build()).build(),
new EnvVarBuilder().withName("KAMELETS_GIT_REPOSITORY").withValueFrom(
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-repository").and().build()).build(),
new EnvVarBuilder().withName("KAMELETS_GIT_USERNAME").withValueFrom(
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-username").and().build()).build(),
new EnvVarBuilder().withName("KAMELETS_GIT_PASSWORD").withValueFrom(
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-password").and().build()).build(),
- new EnvVarBuilder().withName("KAMELETS_GIT_MAIN").withValueFrom(
- new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-main").and().build()).build(),
+ new EnvVarBuilder().withName("KAMELETS_GIT_BRANCH").withValueFrom(
+ new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-branch").and().build()).build(),
new EnvVarBuilder().withName("IMAGE_REGISTRY").withValueFrom(
new EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry").withOptional(true).and().build()).build()
)
diff --git a/karavan-operator/src/main/resources/karavan-quarkus-builder-script.sh b/karavan-operator/src/main/resources/karavan-quarkus-builder-script.sh
index 4b15ea5..e8f6861 100644
--- a/karavan-operator/src/main/resources/karavan-quarkus-builder-script.sh
+++ b/karavan-operator/src/main/resources/karavan-quarkus-builder-script.sh
@@ -6,9 +6,9 @@ then
replacer=https://$KAMELETS_GIT_PASSWORD@
prefix=https://
url="${KAMELETS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${KAMELETS_GIT_MAIN} $url ${KAMELETS_DIR}
+ git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} $url ${KAMELETS_DIR}
else
- git clone --depth 1 --branch ${KAMELETS_GIT_MAIN} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
+ git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
fi
CHECKOUT_DIR="/scripts"
@@ -18,9 +18,9 @@ then
replacer=https://$PROJECTS_GIT_PASSWORD@
prefix=https://
url="${PROJECTS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${PROJECTS_GIT_MAIN} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} $url ${CHECKOUT_DIR}
else
- git clone --depth 1 --branch ${PROJECTS_GIT_MAIN} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)