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/12/16 23:31:54 UTC
[camel-karavan] branch main updated (badd5cb -> 6bf976a)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from badd5cb Service port for spring-boot app
new e16a2e3 Pod management
new 6bf976a Clear statuses on startup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/karavan/informer/PodEventHandler.java | 2 +-
.../java/org/apache/camel/karavan/service/InfinispanService.java | 9 +++++++++
.../java/org/apache/camel/karavan/service/KaravanService.java | 1 +
.../java/org/apache/camel/karavan/service/KubernetesService.java | 1 +
.../org/apache/camel/karavan/operator/resource/KaravanRole.java | 3 ++-
5 files changed, 14 insertions(+), 2 deletions(-)
[camel-karavan] 02/02: Clear statuses on startup
Posted by ma...@apache.org.
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 6bf976ab3a6032846e8736da7acdd3c15c673789
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Dec 16 18:31:47 2022 -0500
Clear statuses on startup
---
.../java/org/apache/camel/karavan/service/InfinispanService.java | 9 +++++++++
.../java/org/apache/camel/karavan/service/KaravanService.java | 1 +
.../java/org/apache/camel/karavan/service/KubernetesService.java | 1 +
3 files changed, 11 insertions(+)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
index adc641e..d86a37e 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
@@ -45,6 +45,7 @@ import java.time.Instant;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@ApplicationScoped
@@ -292,4 +293,12 @@ public class InfinispanService {
}
+ protected void clearAllStatuses() {
+ CompletableFuture.allOf(
+ deploymentStatuses.clearAsync(),
+ podStatuses.clearAsync(),
+ pipelineStatuses.clearAsync(),
+ camelStatuses.clearAsync()
+ ).join();
+ }
}
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
index cd3f5bf..d235d17 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
@@ -47,6 +47,7 @@ public class KaravanService {
void onStart(@Observes StartupEvent ev) {
LOGGER.info("Start Karavan");
infinispanService.start();
+ infinispanService.clearAllStatuses();
setEnvironment();
initialImport();
startInformers();
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index b349e15..62175b2 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -130,6 +130,7 @@ public class KubernetesService {
void stopInformers(String data) {
LOGGER.info("Stop Kubernetes Informers");
informers.forEach(informer -> informer.close());
+ informers.clear();
}
private String getPipelineName(Project project) {
[camel-karavan] 01/02: Pod management
Posted by ma...@apache.org.
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 e16a2e373e5bf5547a50688140688cdef15a54d9
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Dec 16 18:24:06 2022 -0500
Pod management
---
.../main/java/org/apache/camel/karavan/informer/PodEventHandler.java | 2 +-
.../java/org/apache/camel/karavan/operator/resource/KaravanRole.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
index 1e89077..78f01be 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
@@ -47,7 +47,7 @@ public class PodEventHandler implements ResourceEventHandler<Pod> {
public void onDelete(Pod pod, boolean deletedFinalStateUnknown) {
try {
LOGGER.info("onDelete " + pod.getMetadata().getName());
- String deployment = pod.getMetadata().getLabels().get("app.kubernetes.io/name");
+ String deployment = pod.getMetadata().getLabels().get("app");
PodStatus ps = new PodStatus(
pod.getMetadata().getName(),
deployment,
diff --git a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanRole.java b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanRole.java
index fef92c6..8bf2c52 100644
--- a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanRole.java
+++ b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanRole.java
@@ -43,7 +43,8 @@ public class KaravanRole extends CRUDKubernetesDependentResource<Role, Karavan>
new PolicyRuleBuilder().withApiGroups("").withResources("secrets", "configmaps").withVerbs("get", "list").build(),
new PolicyRuleBuilder().withApiGroups("").withResources("persistentvolumes", "persistentvolumeclaims").withVerbs("get", "list", "watch").build(),
new PolicyRuleBuilder().withApiGroups("tekton.dev").withResources("pipelineruns").withVerbs("*").build(),
- new PolicyRuleBuilder().withApiGroups("", "apps").withResources("deployments", "services", "routes", "replicationcontrollers").withVerbs("*").build()
+ new PolicyRuleBuilder().withApiGroups("").withResources("pods", "services", "routes", "replicationcontrollers").withVerbs("*").build(),
+ new PolicyRuleBuilder().withApiGroups("apps").withResources("deployments").withVerbs("*").build()
)
.build();
}