Skip to content
Snippets Groups Projects
Commit b6ad2e56 authored by trantzas's avatar trantzas
Browse files

Merge branch...

Merge branch '21-cr-deletion-must-check-that-all-the-headers-are-present-before-proceeding-2' into 'develop'

Resolve "CR deletion must check that all the headers are present before proceeding"

See merge request !21
parents c395e0db 5aa52f99
No related branches found
No related tags found
1 merge request!21Resolve "CR deletion must check that all the headers are present before proceeding"
Pipeline #14000 passed
...@@ -467,7 +467,12 @@ public class KubernetesClientResource { ...@@ -467,7 +467,12 @@ public class KubernetesClientResource {
} }
})); }));
gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ;
String crName = (String) headers.get("org.etsi.osl.prefixName");
if ( crName == null || crName.isBlank() || crName.isEmpty() ) {
return "ERROR Custom Resource Name is empty";
}
gkr.getMetadata().setName( crName ) ;
String nameSpacename = (String) headers.get("org.etsi.osl.namespace"); String nameSpacename = (String) headers.get("org.etsi.osl.namespace");
if ( gkr.getMetadata().getNamespace() == null ) { if ( gkr.getMetadata().getNamespace() == null ) {
gkr.getMetadata().setNamespace(nameSpacename); gkr.getMetadata().setNamespace(nameSpacename);
...@@ -475,7 +480,8 @@ public class KubernetesClientResource { ...@@ -475,7 +480,8 @@ public class KubernetesClientResource {
logger.debug("Object to delete:{}", Serialization.asYaml( gkr ) ); logger.debug("Object to delete:{}", Serialization.asYaml( gkr ) );
Resource<GenericKubernetesResource> dummyObject = kubernetesClient.resource( gkr ); Resource<GenericKubernetesResource> dummyObject = kubernetesClient.resource( gkr );
logger.debug("============ DELETE crspec: dummyObject {} =============", dummyObject.toString() );
List<StatusDetails> result = dummyObject.delete(); List<StatusDetails> result = dummyObject.delete();
logger.debug("============ DELETE crspec: result {} =============", result.toString() ); logger.debug("============ DELETE crspec: result {} =============", result.toString() );
......
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