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 9d4e77c Cleanup
9d4e77c is described below
commit 9d4e77c5bfed524e60d947da48be7530751fc60e
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Fri Oct 28 20:44:26 2022 -0400
Cleanup
---
.../camel/karavan/informer/DeploymentEventHandler.java | 13 -------------
.../org/apache/camel/karavan/informer/PodEventHandler.java | 1 -
.../apache/camel/karavan/informer/ServiceEventHandler.java | 12 ------------
.../org/apache/camel/karavan/service/InfinispanService.java | 5 +++--
4 files changed, 3 insertions(+), 28 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
index 7ba4793..31784ff 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/DeploymentEventHandler.java
@@ -25,14 +25,6 @@ public class DeploymentEventHandler implements
ResourceEventHandler<Deployment>
LOGGER.info("onAdd " + deployment.getMetadata().getName());
DeploymentStatus ds = getDeploymentStatus(deployment);
infinispanService.saveDeploymentStatus(ds);
- // TODO: Delete after UI design
- infinispanService.saveEnvironment(new Environment("test", "test",
"karavan-test", "test-pipeline"));
- infinispanService.saveEnvironment(new Environment("prod", "prod",
"karavan-prod", "prod-pipeline"));
- DeploymentStatus ds1 = getDeploymentStatus(deployment);
- ds1.setEnv("test");
- ds1.setNamespace("karavan-test");
- ds1.setCluster("demo.cluster");
- infinispanService.saveDeploymentStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}
@@ -44,11 +36,6 @@ public class DeploymentEventHandler implements
ResourceEventHandler<Deployment>
LOGGER.info("onUpdate " + newDeployment.getMetadata().getName());
DeploymentStatus ds = getDeploymentStatus(newDeployment);
infinispanService.saveDeploymentStatus(ds);
- // TODO: Delete after UI design
- DeploymentStatus ds1 = getDeploymentStatus(newDeployment);
- ds1.setEnv("test");
- ds1.setCluster("demo.cluster");
- infinispanService.saveDeploymentStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}
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 63b30c2..0f960bf 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
@@ -4,7 +4,6 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodCondition;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import org.apache.camel.karavan.model.PodStatus;
-import org.apache.camel.karavan.model.ServiceStatus;
import org.apache.camel.karavan.service.InfinispanService;
import org.apache.camel.karavan.service.KubernetesService;
import org.jboss.logging.Logger;
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/ServiceEventHandler.java
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/ServiceEventHandler.java
index dc7382a..c522ffe 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/informer/ServiceEventHandler.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/informer/ServiceEventHandler.java
@@ -3,7 +3,6 @@ package org.apache.camel.karavan.informer;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import org.apache.camel.karavan.model.ServiceStatus;
-import org.apache.camel.karavan.model.Environment;
import org.apache.camel.karavan.service.InfinispanService;
import org.apache.camel.karavan.service.KubernetesService;
import org.jboss.logging.Logger;
@@ -25,12 +24,6 @@ public class ServiceEventHandler implements
ResourceEventHandler<Service> {
LOGGER.info("onAdd " + service.getMetadata().getName());
ServiceStatus ds = getServiceStatus(service);
infinispanService.saveServiceStatus(ds);
- // TODO: Delete after UI design
- infinispanService.saveEnvironment(new Environment("test", "demo",
"karavan-test", "test-pipeline"));
- ServiceStatus ds1 = getServiceStatus(service);
- ds1.setEnv("test");
- ds1.setCluster("demo.cluster");
- infinispanService.saveServiceStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}
@@ -42,11 +35,6 @@ public class ServiceEventHandler implements
ResourceEventHandler<Service> {
LOGGER.info("onUpdate " + newService.getMetadata().getName());
ServiceStatus ds = getServiceStatus(newService);
infinispanService.saveServiceStatus(ds);
- // TODO: Delete after UI design
- ServiceStatus ds1 = getServiceStatus(newService);
- ds1.setEnv("test");
- ds1.setCluster("demo.cluster");
- infinispanService.saveServiceStatus(ds1);
} catch (Exception e){
LOGGER.error(e.getMessage());
}
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 800f045..fabd74c 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
@@ -101,7 +101,7 @@ public class InfinispanService {
camelStatuses =
cacheManager.administration().withFlags(CacheContainerAdmin.AdminFlag.VOLATILE).getOrCreateCache(CamelStatus.CACHE,
builder.build());
kamelets =
cacheManager.administration().withFlags(CacheContainerAdmin.AdminFlag.VOLATILE).getOrCreateCache(Kamelet.CACHE,
builder.build());
- cleanStatuses();
+ cleanData();
} else {
LOGGER.info("InfinispanService is starting in remote mode");
environments =
cacheManager.administration().getOrCreateCache(Environment.CACHE, new
XMLStringConfiguration(String.format(CACHE_CONFIG, Environment.CACHE)));
@@ -116,7 +116,8 @@ public class InfinispanService {
}
}
- private void cleanStatuses() {
+ private void cleanData() {
+ environments.clear();
deploymentStatuses.clear();
podStatuses.clear();
pipelineStatuses.clear();
