Skip to content

Commit b9162da

Browse files
committed
Adapt to new library version API
1 parent 9b34891 commit b9162da

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/uk/ac/ebi/tsc/tesk/k8s/convert/TesKubernetesConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ public V1Job fromTesExecutorToK8sJob(String generatedTaskId, String tesTaskName,
150150
executor.getEnv().forEach((key, value) -> container.addEnvItem(new V1EnvVar().name(key).value(value)));
151151
}
152152
container.setWorkingDir(executor.getWorkdir());
153-
Optional.ofNullable(resources).map(TesResources::getCpuCores).ifPresent(cpuCores -> container.getResources().putRequestsItem(RESOURCE_CPU_KEY, cpuCores.toString()));
154-
Optional.ofNullable(resources).map(TesResources::getRamGb).ifPresent(ramGb -> container.getResources().putRequestsItem(RESOURCE_MEM_KEY, ramGb.toString() + RESOURCE_MEM_UNIT));
153+
Optional.ofNullable(resources).map(TesResources::getCpuCores).ifPresent(cpuCores -> container.getResources().putRequestsItem(RESOURCE_CPU_KEY, new QuantityFormatter().parse(cpuCores.toString())));
154+
Optional.ofNullable(resources).map(TesResources::getRamGb).ifPresent(ramGb -> container.getResources().putRequestsItem(RESOURCE_MEM_KEY, new QuantityFormatter().parse(ramGb.toString() + RESOURCE_MEM_UNIT)));
155155

156156
return job;
157157
}

src/main/java/uk/ac/ebi/tsc/tesk/k8s/service/KubernetesClientWrapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ private V1JobList listJobs(String _continue, String labelSelector, Integer limit
9696
*/
9797
private V1LimitRangeList listLimits(String _continue, String labelSelector, Integer limit) {
9898
try {
99-
return this.coreApi.listNamespacedLimitRange(namespace, null, null, _continue, null,
100-
labelSelector, limit, null, null, null);
99+
return this.coreApi.listNamespacedLimitRange(namespace, (String)null, (Boolean)null, _continue, (String)null,
100+
labelSelector, limit, (String)null, (String)null, (Integer)null, (Boolean)null);
101101
} catch (ApiException e) {
102102
throw KubernetesException.fromApiException(e);
103103
}
@@ -113,7 +113,7 @@ public Double minimumRamGb() {
113113
for (V1LimitRange limit : listLimits(null, null, null).getItems())
114114
for (V1LimitRangeItem item : limit.getSpec().getLimits()) {
115115
if(item.getMin() != null && item.getMin().get(RESOURCE_MEM_KEY) != null) {
116-
Quantity quantity = new QuantityFormatter().parse(item.getMin().get(RESOURCE_MEM_KEY));
116+
Quantity quantity = item.getMin().get(RESOURCE_MEM_KEY);
117117
if(returnValue.compareTo(quantity.getNumber()) == -1) returnValue = quantity.getNumber();
118118
}
119119
}

0 commit comments

Comments
 (0)