From 35fecd83f16a03fec2aec65e5d619327787456c2 Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Mon, 5 Feb 2024 11:49:27 +0200
Subject: [PATCH] adding namespace to metadata before delete
---
.../osl/cridge/KubernetesClientResource.java | 19 +++++++++++--------
.../osl/cridge/CridgeIntegrationTest.java | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
index 3547b83..088cd98 100644
--- a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
+++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
@@ -590,10 +590,7 @@ public class KubernetesClientResource {
logger.debug("============ DELETE crspec =============" );
if (!checkCRIDGEClusterContext(headers)) {
return "SEE OTHER";
- }
- logger.debug("{}", crspec );
-
-
+ }
try {
@@ -606,20 +603,26 @@ public class KubernetesClientResource {
}
}
}));
+
gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ;
- Resource<GenericKubernetesResource> dummyObject = kubernetesClient.resource( gkr );
- logger.debug("Object to delete:{}", dummyObject );
- List<StatusDetails> result = dummyObject.delete();
+ String nameSpacename = (String) headers.get("org.etsi.osl.namespace");
+ if ( gkr.getMetadata().getNamespace() == null ) {
+ gkr.getMetadata().setNamespace(nameSpacename);
+ }
+ logger.debug("Object to delete:{}", Serialization.asYaml( gkr ) );
+ Resource<GenericKubernetesResource> dummyObject = kubernetesClient.resource( gkr );
+
+ List<StatusDetails> result = dummyObject.delete();
logger.debug("============ DELETE crspec: result {} =============", result.toString() );
- String nameSpacename = (String) headers.get("org.etsi.osl.namespace");
this.nameSpacesTobeDeleted.put(nameSpacename, new Date() );
this.watchersForNamespaces.remove(nameSpacename);
}catch (Exception e) {
e.printStackTrace();
+ return "ERROR " + e.getMessage();
}
return "OK";
diff --git a/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java b/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
index b6f38b5..d70300a 100644
--- a/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
+++ b/src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java
@@ -426,7 +426,7 @@ public class CridgeIntegrationTest {
@Test
public void testCRDelete() throws Exception {
- logger.info("===============TEST testCRDEPLOY =============================");
+ logger.info("===============TEST testCRDelete =============================");
// CustomResourceDefinition cronTabCrd = routesPreparation.kubernetesClient.apiextensions().v1()
--
GitLab