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 2023/03/03 16:40:39 UTC
[camel-karavan] branch main updated: Update Quarkiverse operator SDK to 5.1.1 (#671)
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 a3f19572 Update Quarkiverse operator SDK to 5.1.1 (#671)
a3f19572 is described below
commit a3f19572553ed0bdcdcea6fe78dac9545041da89
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Fri Mar 3 19:40:33 2023 +0300
Update Quarkiverse operator SDK to 5.1.1 (#671)
* Update Quarkiverse operator SDK to 5.1.1
* Fix Idea issue for maven-compiler-plugin
---
karavan-operator/Makefile | 2 +-
karavan-operator/pom.xml | 5 +++--
.../java/org/apache/camel/karavan/operator/KaravanReconciler.java | 5 +++--
.../src/main/java/org/apache/camel/karavan/operator/Utils.java | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/karavan-operator/Makefile b/karavan-operator/Makefile
index 3d4d999f..ac3df03f 100644
--- a/karavan-operator/Makefile
+++ b/karavan-operator/Makefile
@@ -76,7 +76,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
##@ Bundle
.PHONY: bundle
-bundle: ## Generate bundle manifests and metadata, then validate generated files.
+bundle: ## Generate bundle manifests and metadata, then validate generated files.
## marker
cat target/kubernetes/karavans.app.karavan.camel.apache.org-v1.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
operator-sdk bundle validate ./bundle
diff --git a/karavan-operator/pom.xml b/karavan-operator/pom.xml
index 8968a446..b7f5eebd 100644
--- a/karavan-operator/pom.xml
+++ b/karavan-operator/pom.xml
@@ -15,8 +15,8 @@
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <quarkus-sdk.version>4.0.5</quarkus-sdk.version>
- <quarkus.version>2.13.0.Final</quarkus.version>
+ <quarkus-sdk.version>5.1.1</quarkus-sdk.version>
+ <quarkus.version>2.16.4.Final</quarkus.version>
</properties>
<dependencyManagement>
@@ -82,6 +82,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
</plugin>
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/KaravanReconciler.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/KaravanReconciler.java
index 456628a8..e383aa6f 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/KaravanReconciler.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/KaravanReconciler.java
@@ -29,8 +29,9 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernete
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
import io.javaoperatorsdk.operator.processing.dependent.workflow.Workflow;
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowReconcileResult;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowBuilder;
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.quarkus.runtime.Quarkus;
import org.apache.camel.karavan.operator.resource.KaravanDeployment;
import org.apache.camel.karavan.operator.resource.KaravanPvcData;
import org.apache.camel.karavan.operator.resource.KaravanPvcJbang;
@@ -68,7 +69,7 @@ public class KaravanReconciler implements Reconciler<Karavan>, EventSourceInitia
static final Logger log = LoggerFactory.getLogger(KaravanReconciler.class);
- private boolean isOpenShift = false;
+ private boolean isOpenShift;
private KubernetesClient client;
private SharedIndexInformer informer;
private Workflow<Karavan> workflow;
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/Utils.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/Utils.java
index 425f83d3..990ac2eb 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/Utils.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/Utils.java
@@ -43,8 +43,8 @@ public class Utils {
Pipeline pipeline = new Pipeline();
Task task = new Task();
APIResourceList kinds = client.getApiResources(pipeline.getApiVersion());
- if (kinds != null && kinds.getResources().stream().filter(res -> res.getKind().equalsIgnoreCase(pipeline.getKind())).findAny().isPresent() &&
- kinds.getResources().stream().filter(res -> res.getKind().equalsIgnoreCase(task.getKind())).findAny().isPresent()) {
+ if (kinds != null && kinds.getResources().stream().anyMatch(res -> res.getKind().equalsIgnoreCase(pipeline.getKind())) &&
+ kinds.getResources().stream().anyMatch(res -> res.getKind().equalsIgnoreCase(task.getKind()))) {
if (isOpenShift(client)) {
long oper = client.adapt(OpenShiftClient.class).operatorHub().subscriptions().list().getItems().stream()
.filter(sub -> sub.getMetadata().getName().contains("openshift-pipelines-operator")).count();