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/17 20:31:36 UTC
[camel-karavan] branch main updated: Fix Task image and version config
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 1d07809 Fix Task image and version config
1d07809 is described below
commit 1d0780999564135d56b4dae585a2759b728613e7
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Mon Oct 17 16:31:19 2022 -0400
Fix Task image and version config
---
.../camel/karavan/operator/resource/KaravanTektonTask.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
index 97a0783..4e07b7e 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
@@ -35,7 +35,7 @@ import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
import org.apache.camel.karavan.operator.Constants;
import org.apache.camel.karavan.operator.spec.Karavan;
import org.apache.camel.karavan.operator.Utils;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.config.ConfigProvider;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -45,12 +45,6 @@ import java.util.stream.Collectors;
public class KaravanTektonTask extends CRUDKubernetesDependentResource<Task, Karavan> implements Condition<Task, Karavan> {
- @ConfigProperty(name = "karavan.version")
- String version;
-
- @ConfigProperty(name = "karavan.quarkus-build-image")
- String image;
-
public KaravanTektonTask() {
super(Task.class);
}
@@ -58,7 +52,10 @@ public class KaravanTektonTask extends CRUDKubernetesDependentResource<Task, Kar
@Override
@SuppressWarnings("unchecked")
public Task desired(Karavan karavan, Context<Karavan> context) {
+ String image = ConfigProvider.getConfig().getValue("karavan.quarkus-build-image", String.class);
+ String version = ConfigProvider.getConfig().getValue("karavan.version", String.class);
String script = getScript(karavan);
+
return new TaskBuilder()
.withNewMetadata()
.withName(Constants.TASK_BUILD_QUARKUS)