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/28 20:56:08 UTC
[camel-karavan] branch main updated: Log in operator
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 767762c Log in operator
767762c is described below
commit 767762c8aa8ed4dabbc0a55be1c4f1ef3927aa1f
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Oct 28 16:56:00 2022 -0400
Log in operator
---
.../org/apache/camel/karavan/operator/KaravanReconciler.java | 2 ++
.../camel/karavan/operator/watcher/TektonCrdEventHandler.java | 6 ++++--
.../operator/watcher/TektonSubscriptionEventHandler.java | 10 +++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
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 fed42be..b60fc3b 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
@@ -131,6 +131,7 @@ public class KaravanReconciler implements Reconciler<Karavan>, EventSourceInitia
}
private void initDependentResources() {
+ log.info("Init Dependent Resources");
this.karavanServiceAccount = new KaravanServiceAccount();
this.karavanRole = new KaravanRole();
this.karavanRoleBinding = new KaravanRoleBinding();
@@ -146,6 +147,7 @@ public class KaravanReconciler implements Reconciler<Karavan>, EventSourceInitia
}
if (Utils.isTektonInstalled(client)) {
+ log.info("Init Tekton Dependent Resources");
this.karavanTektonTask = new KaravanTektonTask(isOpenShift);
this.karavanTektonPipeline = new KaravanTektonPipeline();
this.pipelineServiceAccount = new PipelineServiceAccount();
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonCrdEventHandler.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonCrdEventHandler.java
index bfa68ad..9983c14 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonCrdEventHandler.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonCrdEventHandler.java
@@ -22,6 +22,8 @@ import org.apache.camel.karavan.operator.KaravanReconciler;
public class TektonCrdEventHandler implements ResourceEventHandler<CustomResourceDefinition> {
+ private static final String NAME = "pipelines.tekton.dev";
+
private KaravanReconciler karavanReconciler;
public TektonCrdEventHandler(KaravanReconciler karavanReconciler) {
@@ -30,14 +32,14 @@ public class TektonCrdEventHandler implements ResourceEventHandler<CustomResourc
@Override
public void onAdd(CustomResourceDefinition crd) {
- if (crd.getMetadata().getName().contains("pipelines.tekton.dev")) {
+ if (crd.getMetadata().getName().contains(NAME)) {
karavanReconciler.addTektonResources();
}
}
@Override
public void onUpdate(CustomResourceDefinition crd1, CustomResourceDefinition crd2) {
- if (crd2.getMetadata().getName().contains("pipelines.tekton.dev")) {
+ if (crd2.getMetadata().getName().contains(NAME)) {
karavanReconciler.addTektonResources();
}
}
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonSubscriptionEventHandler.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonSubscriptionEventHandler.java
index 5ac485a..c468f92 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonSubscriptionEventHandler.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/watcher/TektonSubscriptionEventHandler.java
@@ -22,6 +22,8 @@ import org.apache.camel.karavan.operator.KaravanReconciler;
public class TektonSubscriptionEventHandler implements ResourceEventHandler<Subscription> {
+ private static final String NAME = "openshift-pipelines-operator";
+
private KaravanReconciler karavanReconciler;
public TektonSubscriptionEventHandler(KaravanReconciler karavanReconciler) {
@@ -30,14 +32,16 @@ public class TektonSubscriptionEventHandler implements ResourceEventHandler<Subs
@Override
public void onAdd(Subscription subscription) {
- if (subscription.getMetadata().getName().contains("openshift-pipelines-operator")) {
+ if (subscription.getMetadata().getName().contains(NAME)) {
karavanReconciler.addTektonResources();
}
}
@Override
- public void onUpdate(Subscription oldObj, Subscription newObj) {
-
+ public void onUpdate(Subscription oldSubscription, Subscription newSubscription) {
+ if (newSubscription.getMetadata().getName().contains(NAME)) {
+ karavanReconciler.addTektonResources();
+ }
}
@Override