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 917135c3ab3acfd766110e6ffdf4ad9cbe11dea3
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Mon Oct 17 10:05:49 2022 -0400
Image and Version issues
---
.../karavan/operator/resource/KaravanDeployment.java | 16 ++++++++++------
.../operator/spec/KaravanOperatorCSVMetadata.java | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanDeployment.java
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanDeployment.java
index d7a23fa..2169837 100644
---
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanDeployment.java
+++
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanDeployment.java
@@ -32,9 +32,12 @@ import
io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import
io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
import org.apache.camel.karavan.operator.Constants;
+import org.apache.camel.karavan.operator.KaravanReconciler;
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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -42,11 +45,7 @@ import java.util.Map;
public class KaravanDeployment extends
CRUDKubernetesDependentResource<Deployment, Karavan> {
- @ConfigProperty(name = "karavan.version")
- String version;
-
- @ConfigProperty(name = "karavan.image")
- String baseImage;
+ static final Logger log = LoggerFactory.getLogger(KaravanReconciler.class);
public KaravanDeployment() {
super(Deployment.class);
@@ -56,6 +55,9 @@ public class KaravanDeployment extends
CRUDKubernetesDependentResource<Deploymen
@SuppressWarnings("unchecked")
public Deployment desired(Karavan karavan, Context<Karavan> context) {
+ String baseImage =
ConfigProvider.getConfig().getValue("karavan.image", String.class);
+ String version =
ConfigProvider.getConfig().getValue("karavan.version", String.class);
+
String image = baseImage + ":" + version;
List<EnvVar> envVarList = new ArrayList<>();
@@ -80,6 +82,8 @@ public class KaravanDeployment extends
CRUDKubernetesDependentResource<Deploymen
);
}
+ log.info("Deployment image: " + image);
+
return new DeploymentBuilder()
.withNewMetadata()
.withName(Constants.NAME)
diff --git
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
index 0def9ce..e6f1ae1 100644
---
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
+++
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/spec/KaravanOperatorCSVMetadata.java
@@ -73,7 +73,7 @@ import
io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
@CSVMetadata.PermissionRule(apiGroups = {""}, resources =
{"serviceaccounts", "secrets", "configmaps"}),
@CSVMetadata.PermissionRule(apiGroups = {"tekton.dev"},
resources = {"pipelinetasks", "pipelines"}),
@CSVMetadata.PermissionRule(apiGroups = {"networking.k8s.io"},
resources = {"ingresses"}),
- @CSVMetadata.PermissionRule(apiGroups =
{"operators.coreos.com/v1alpha1"}, resources = {"catalogsources"}),
+ @CSVMetadata.PermissionRule(apiGroups =
{"operators.coreos.com"}, resources = {"catalogsources"}),
},
keywords = {"apache", "camel", "karavan", "integration",
"microservices", "low-code"},
version = "3.18.5",
