Skip to content
Snippets Groups Projects
Commit 35fecd83 authored by tranoris's avatar tranoris
Browse files

adding namespace to metadata before delete

parent 5d409fc1
No related branches found
No related tags found
1 merge request!8Merging 2024Q2_RC into main, creating 2024Q2 Release
Pipeline #4388 passed
......@@ -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";
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment