diff --git a/onyxia-api/pom.xml b/onyxia-api/pom.xml
index 7a4a2042..bbaba48f 100644
--- a/onyxia-api/pom.xml
+++ b/onyxia-api/pom.xml
@@ -43,7 +43,7 @@
org.springdoc
springdoc-openapi-starter-webmvc-ui
- 2.4.0
+ 2.5.0
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java
index 841d2a70..dfda529f 100644
--- a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java
+++ b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmAppsService.java
@@ -26,7 +26,6 @@
import fr.insee.onyxia.model.project.Project;
import fr.insee.onyxia.model.region.Region;
import fr.insee.onyxia.model.service.*;
-import io.fabric8.kubernetes.api.model.EventList;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.Watcher;
import io.github.inseefrlab.helmwrapper.configuration.HelmConfiguration;
@@ -485,34 +484,6 @@ private Service getServiceFromRelease(
})
.collect(Collectors.toList()));
- EventList eventList = client.v1().events().inNamespace(release.getNamespace()).list();
- List events =
- eventList.getItems().stream()
- .filter(
- event ->
- event.getInvolvedObject() != null
- && event.getInvolvedObject().getName() != null
- && event.getInvolvedObject()
- .getName()
- .contains(release.getName()))
- .map(
- event -> {
- Event newEvent = new Event();
- newEvent.setMessage(event.getMessage());
- try {
- // TODO : use kubernetes time format instead of helm
- newEvent.setTimestamp(
- helmDateFormat
- .parse(event.getEventTime().getTime())
- .getTime());
- } catch (Exception e) {
-
- }
- return newEvent;
- })
- .collect(Collectors.toList());
- service.setEvents(events);
-
return service;
}
}
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/kubernetes/KubernetesService.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/kubernetes/KubernetesService.java
index c53f09b6..16e43623 100644
--- a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/kubernetes/KubernetesService.java
+++ b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/kubernetes/KubernetesService.java
@@ -169,12 +169,11 @@ private String createNamespace(Region region, String namespaceId, Owner owner) {
private boolean isNamespaceAlreadyExisting(Region region, String namespaceId) {
return kubernetesClientProvider
- .getRootClient(region)
- .namespaces()
- .list()
- .getItems()
- .stream()
- .anyMatch(ns -> ns.getMetadata().getName().equals(namespaceId));
+ .getRootClient(region)
+ .namespaces()
+ .withName(namespaceId)
+ .get()
+ != null;
}
private void applyQuotas(
diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/service/Service.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/service/Service.java
index 451c28b3..eee067a4 100644
--- a/onyxia-model/src/main/java/fr/insee/onyxia/model/service/Service.java
+++ b/onyxia-model/src/main/java/fr/insee/onyxia/model/service/Service.java
@@ -44,9 +44,6 @@ public class Service {
@Schema(description = "Task represents pods running. This should be re-ingeneer in v1.0")
private List tasks = new ArrayList<>();
- @Schema(description = "This should be re-ingeneer in v1.0")
- private List events = new ArrayList<>();
-
@Schema(description = "This should be removed in v1.0")
private String subtitle;
@@ -181,14 +178,6 @@ public void setSubtitle(String subtitle) {
this.subtitle = subtitle;
}
- public List getEvents() {
- return events;
- }
-
- public void setEvents(List events) {
- this.events = events;
- }
-
public List getInternalUrls() {
return internalUrls;
}