diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java index 3547b839c0ad5ca29ed216fe1d0358196bbfcd5f..088cd982fdfd3af871c23c519db39fcd9824ace2 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 b6f38b5cf037eded27ebf953b2263b043fe1625e..d70300a9a623ed7036dae702a6a9b022459967ca 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()