From f30ea79abb3b52a378a123fc04e7b04e363b5767 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sat, 29 Mar 2025 17:41:01 +0100 Subject: [PATCH 1/2] Minor editorial changes. --- dev-example/Readme.md | 4 ++-- webpages/upgrading.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-example/Readme.md b/dev-example/Readme.md index ba381e1..d794b24 100644 --- a/dev-example/Readme.md +++ b/dev-example/Readme.md @@ -3,9 +3,9 @@ The CRD must be deployed independently. Apart from that, the `kustomize.yaml` -* creates a small cdrom image repository and + * creates a small cdrom image repository and -* deploys the operator in namespace `vmop-dev` with a replica of 0. + * deploys the operator in namespace `vmop-dev` with a replica of 0. This allows you to run the manager in your IDE. diff --git a/webpages/upgrading.md b/webpages/upgrading.md index 644dce6..f3119b0 100644 --- a/webpages/upgrading.md +++ b/webpages/upgrading.md @@ -34,7 +34,7 @@ layout: vm-operator update the template manually. If you're using your own template, you have to add a virtual serial port (see the git history of the standard template for the required addition). - + * Stateful sets from pre 3.4.0 versions are no longer removed automatically (see notes below). However, PVCs with the old naming scheme are still reused. From c79d678a2a8928e6ba9a78ea9e7748d36e71665d Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sat, 29 Mar 2025 18:38:09 +0100 Subject: [PATCH 2/2] More consistent logging. --- .../org/jdrupes/vmoperator/manager/ConfigMapReconciler.java | 2 ++ .../src/org/jdrupes/vmoperator/manager/Controller.java | 2 +- .../jdrupes/vmoperator/manager/DisplaySecretReconciler.java | 4 +++- .../jdrupes/vmoperator/manager/LoadBalancerReconciler.java | 3 +++ .../src/org/jdrupes/vmoperator/manager/Manager.java | 2 +- .../src/org/jdrupes/vmoperator/manager/PvcReconciler.java | 2 ++ 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java index 161678a..264a166 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java @@ -98,6 +98,8 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; channel.setAssociated(PrevData.class, prevData); // Combine template and data and parse result + logger.fine(() -> "Create/update configmap " + + DataPath. get(model, "cr", "name").orElse("unknown")); model.put("adjustCloudInitMeta", adjustCloudInitMetaModel); prevData.added.put("adjustCloudInitMeta", adjustCloudInitMetaModel); var fmTemplate = fmConfig.getTemplate("runnerConfig.ftl.yaml"); diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java index eaf2447..c15acc5 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java @@ -182,7 +182,7 @@ public class Controller extends Component { fire(new Exit(2)); return; } - logger.fine(() -> "Controlling namespace \"" + namespace + "\"."); + logger.config(() -> "Controlling namespace \"" + namespace + "\"."); } /** diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java index 5111438..60d27d4 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java @@ -155,9 +155,11 @@ public class DisplaySecretReconciler extends Component { } // Create secret + var secretName = vmDef.name() + "-" + DisplaySecret.NAME; + logger.fine(() -> "Create/update secret " + secretName); var secret = new V1Secret(); secret.setMetadata(new V1ObjectMeta().namespace(vmDef.namespace()) - .name(vmDef.name() + "-" + DisplaySecret.NAME) + .name(secretName) .putLabelsItem("app.kubernetes.io/name", APP_NAME) .putLabelsItem("app.kubernetes.io/component", DisplaySecret.NAME) .putLabelsItem("app.kubernetes.io/instance", vmDef.name())); diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/LoadBalancerReconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/LoadBalancerReconciler.java index c0d183b..d190cef 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/LoadBalancerReconciler.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/LoadBalancerReconciler.java @@ -36,6 +36,7 @@ import java.util.logging.Logger; import org.jdrupes.vmoperator.common.K8sV1ServiceStub; import org.jdrupes.vmoperator.common.VmDefinition; import org.jdrupes.vmoperator.manager.events.VmChannel; +import org.jdrupes.vmoperator.util.DataPath; import org.jdrupes.vmoperator.util.GsonPtr; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; @@ -107,6 +108,8 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; } // Combine template and data and parse result + logger.fine(() -> "Create/update load balancer service for " + + DataPath. get(model, "cr", "name").orElse("unknown")); var fmTemplate = fmConfig.getTemplate("runnerLoadBalancer.ftl.yaml"); StringWriter out = new StringWriter(); fmTemplate.process(model, out); diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java index 9d291cf..41b59f9 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java @@ -264,7 +264,7 @@ public class Manager extends Component { */ @Handler(priority = -1000) public void onStop(Stop event) { - logger.fine(() -> "Application stopped."); + logger.info(() -> "Application stopped."); } static { diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PvcReconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PvcReconciler.java index 47aa8be..e297183 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PvcReconciler.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PvcReconciler.java @@ -139,6 +139,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; // Generate PVC var runnerDataPvcName = vmDef.name() + "-runner-data"; + logger.fine(() -> "Create/update pvc " + runnerDataPvcName); model.put("runnerDataPvcName", runnerDataPvcName); if (!specChanged) { // Augmenting the model is all we have to do @@ -180,6 +181,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; } // Generate PVC + logger.fine(() -> "Create/update pvc " + pvcName); model.put("disk", diskDef); var fmTemplate = fmConfig.getTemplate("runnerDiskPvc.ftl.yaml"); StringWriter out = new StringWriter();