mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Fix and clarify usage of methods for status update.

Browse source
This commit is contained in:
Michael Lipp 2025-03-01 17:00:14 +01:00
parent 5e282c4d2b
commit 62a7210117
4 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

35
org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/K8sGenericStub.java
View file

@ -196,51 +196,52 @@ public class K8sGenericStub<O extends KubernetesObject,
* Updates the object's status.
*
* @param object the current state of the object (passed to `status`)
* @param status function that returns the new status
* @param updater function that returns the new status
* @return the updated model or empty if the object was not found
* @throws ApiException the api exception
*/
@SuppressWarnings("PMD.AssignmentInOperand")
public Optional<O> updateStatus(O object, Function<O, Object> status)
public Optional<O> updateStatus(O object, Function<O, Object> updater)
throws ApiException {
return K8s.optional(api.updateStatus(object, status));
return K8s.optional(api.updateStatus(object, updater));
}
/**
* Gets the object and updates the status. In case of conflict, retries
* up to `retries` times.
*
* @param status the status
* @param updater the function updating the status
* @param retries the retries in case of conflict
* @return the updated model or empty if the object was not found
* @throws ApiException the api exception
*/
@SuppressWarnings({ "PMD.AssignmentInOperand", "PMD.UnusedAssignment" })
public Optional<O> updateStatus(Function<O, Object> status, int retries)
public Optional<O> updateStatus(Function<O, Object> updater, int retries)
throws ApiException {
try {
return updateStatus(api.get(namespace, name).throwsApiException()
.getObject(), status);
} catch (ApiException e) {
if (HttpURLConnection.HTTP_CONFLICT != e.getCode()
|| retries-- <= 0) {
throw e;
while (true) {
try {
return updateStatus(api.get(namespace, name)
.throwsApiException().getObject(), updater);
} catch (ApiException e) {
if (HttpURLConnection.HTTP_CONFLICT != e.getCode()
|| retries-- <= 0) {
throw e;
}
}
}
return Optional.empty();
}
/**
* Updates the status.
* Updates the status. In case of conflict, retries up to 16 times.
*
* @param status the status
* @param updater the function updating the status
* @return the kubernetes api response
* the updated model or empty if not successful
* @throws ApiException the api exception
*/
public Optional<O> updateStatus(Function<O, Object> status)
public Optional<O> updateStatus(Function<O, Object> updater)
throws ApiException {
return updateStatus(status, 16);
return updateStatus(updater, 16);
}
/**