From 3a4404b758f28b0332a4690e6310e881df465bd2 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Fri, 14 Mar 2025 16:57:58 +0100 Subject: [PATCH] Add runner version to status. --- deploy/crds/vms-crd.yaml | 4 ++++ .../src/org/jdrupes/vmoperator/common/Constants.java | 3 +++ .../src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/deploy/crds/vms-crd.yaml b/deploy/crds/vms-crd.yaml index 101784f..c2a7a66 100644 --- a/deploy/crds/vms-crd.yaml +++ b/deploy/crds/vms-crd.yaml @@ -1470,6 +1470,10 @@ spec: type: object default: {} properties: + runnerVersion: + description: >- + The version string of the runner. + type: string cpus: description: >- Number of CPUs currently in use. diff --git a/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java b/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java index 83b261e..67939de 100644 --- a/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java +++ b/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/Constants.java @@ -50,6 +50,9 @@ public class Constants { * Status related constants. */ public static class Status { + /** The Constant RUNNER_VERSION. */ + public static final String RUNNER_VERSION = "runnerVersion"; + /** The Constant CPUS. */ public static final String CPUS = "cpus"; diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java index b1580ae..bd4ddb4 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java @@ -31,6 +31,7 @@ import io.kubernetes.client.openapi.JSON; import io.kubernetes.client.openapi.models.EventsV1Event; import java.io.IOException; import java.math.BigDecimal; +import java.util.Optional; import java.util.logging.Level; import static org.jdrupes.vmoperator.common.Constants.APP_NAME; import org.jdrupes.vmoperator.common.Constants.Crd; @@ -124,6 +125,9 @@ public class StatusUpdater extends VmDefUpdater { observedGeneration = vmDef.getMetadata().getGeneration(); vmStub.updateStatus(from -> { JsonObject status = from.statusJson(); + status.addProperty(Status.RUNNER_VERSION, Optional.ofNullable( + Runner.class.getPackage().getImplementationVersion()) + .orElse("(unknown)")); status.remove(Status.LOGGED_IN_USER); return status; });