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

Merge branch 'feature/pools'
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Michael Lipp 2025-03-24 15:05:31 +01:00
commit 7a70d73330
1 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java
View file

@ -76,7 +76,6 @@ public class StatusUpdater extends VmDefUpdater {
private static final ObjectMapper objectMapper
= new ObjectMapper().registerModule(new JavaTimeModule());
private long observedGeneration;
private boolean guestShutdownStops;
private boolean shutdownByGuest;
private VmDefinitionStub vmStub;
@ -131,7 +130,6 @@ public class StatusUpdater extends VmDefUpdater {
if (vmDef == null) {
return;
}
observedGeneration = vmDef.getMetadata().getGeneration();
vmStub.updateStatus(from -> {
JsonObject status = from.statusJson();
status.addProperty(Status.RUNNER_VERSION, Optional.ofNullable(
@ -166,21 +164,6 @@ public class StatusUpdater extends VmDefUpdater {
if (vmStub == null) {
return;
}
// A change of the runner configuration is typically caused
// by a new version of the CR. So we update only if we have
// a new version of the CR. There's one exception: the display
// password is configured by a file, not by the CR.
var vmDef = vmStub.model().orElse(null);
if (vmDef == null) {
return;
}
if (vmDef.metadata().getGeneration() == observedGeneration
&& (event.configuration().hasDisplayPassword
|| vmDef.statusJson().getAsJsonPrimitive(
Status.DISPLAY_PASSWORD_SERIAL).getAsInt() == -1)) {
return;
}
vmStub.updateStatus(from -> {
JsonObject status = from.statusJson();
if (!event.configuration().hasDisplayPassword) {
@ -194,7 +177,7 @@ public class StatusUpdater extends VmDefUpdater {
from.getMetadata().getGeneration()));
updateUserLoggedIn(from);
return status;
}, vmDef);
});
}
/**