Skip to content
Snippets Groups Projects
Commit 9ceb63c1 authored by tranoris's avatar tranoris
Browse files

fixing version to 1.0.0

parent f23126a9
No related branches found
No related tags found
1 merge request!8Merging 2024Q2_RC into main, creating 2024Q2 Release
Pipeline #4189 failed
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
......
......@@ -225,7 +225,7 @@ public class CatalogClient extends RouteBuilder{
try {
Map<String, Object> map = new HashMap<>();
map.put("resourceId", oslResourceId );
map.put("propagateToSO", false );
map.put("triggerServiceActionQueue", false );
Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, toJsonString(rs), map);
......@@ -260,7 +260,7 @@ public class CatalogClient extends RouteBuilder{
// try {
// Map<String, Object> map = new HashMap<>();
// map.put("resourceId", oslResourceId );
// map.put("propagateToSO", false );
// map.put("triggerServiceActionQueue", false );
// String json = toJsonString(rs);
// Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, json, map);
//
......
......@@ -490,10 +490,15 @@ public class KubernetesClientResource {
}
logger.debug("{}", gkr.toString() );
logger.debug("Object to deploy:{}", gkr.toString() );
Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
dummyObject.create();
GenericKubernetesResource result = dummyObject.create();
logger.debug("============ Create crspec: result {} =============", result.toString() );
}catch (Exception e) {
e.printStackTrace();
return "FAIL " + e.getMessage();
......@@ -613,6 +618,7 @@ public class KubernetesClientResource {
}));
gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ;
Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
logger.debug("Object to delete:{}", dummyObject );
List<StatusDetails> result = dummyObject.delete();
logger.debug("============ DELETE crspec: result {} =============", result.toString() );
......@@ -691,4 +697,10 @@ public class KubernetesClientResource {
return true;
}
public void setKubernetesClient(KubernetesClient kubernetesClient2) {
this.kubernetesClient = kubernetesClient2;
}
}
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