Commit 35fecd83 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

adding namespace to metadata before delete

parent 5d409fc1

src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java

+11 −8
Original line number Diff line number Diff line
@@ -591,9 +591,6 @@ public class KubernetesClientResource { 
    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")) ;

      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 );      

      logger.debug("Object to delete:{}", dummyObject );

      List<StatusDetails> result = dummyObject.delete();      

      

      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";

src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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()