From 838bd1bb5e72daab0932099c7a4557cb394da91e Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Fri, 28 Jul 2023 18:01:37 +0200
Subject: [PATCH] Better name for runner pvc.

---
 deploy/crds/vmoperator-crd.yaml                               | 1 +
 deploy/test-vm.yaml                                           | 4 ++--
 .../manager/{vmDataPvc.ftl.yaml => runnerDataPvc.ftl.yaml}    | 2 +-
 .../org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml         | 2 +-
 .../src/org/jdrupes/vmoperator/manager/Reconciler.java        | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/{vmDataPvc.ftl.yaml => runnerDataPvc.ftl.yaml} (87%)

diff --git a/deploy/crds/vmoperator-crd.yaml b/deploy/crds/vmoperator-crd.yaml
index 1cfb88f..dd50c96 100644
--- a/deploy/crds/vmoperator-crd.yaml
+++ b/deploy/crds/vmoperator-crd.yaml
@@ -208,6 +208,7 @@ spec:
                                       idempotence and configuration definition. Cannot be
                                       updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names.
                                       The name is generated automatically but can be overriden.
+                                      Note that the name "<vm-name>-runner-data" is reserved.
                                     type: string
                                   labels:
                                     description: >-
diff --git a/deploy/test-vm.yaml b/deploy/test-vm.yaml
index e3380cd..40c302d 100644
--- a/deploy/test-vm.yaml
+++ b/deploy/test-vm.yaml
@@ -20,8 +20,8 @@ spec:
         mac: "00:16:3e:33:59:10"
     disks:
     - volumeClaimTemplate:
-#        metadata:
-#          name: test-vm-system
+        metadata:
+          name: test-vm-system
         spec:
           storageClassName: ""
           selector:
diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/vmDataPvc.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerDataPvc.ftl.yaml
similarity index 87%
rename from org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/vmDataPvc.ftl.yaml
rename to org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerDataPvc.ftl.yaml
index d33a7f7..a436d8f 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/vmDataPvc.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerDataPvc.ftl.yaml
@@ -2,7 +2,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   namespace: ${ cr.metadata.namespace.asString }
-  name: ${ cr.metadata.name.asString + "-data" }
+  name: ${ cr.metadata.name.asString + "-runner-data" }
   labels:
     app.kubernetes.io/name: ${ constants.APP_NAME }
     app.kubernetes.io/instance: ${ cr.metadata.name.asString }
diff --git a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
index cdfd468..823924a 100644
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerPod.ftl.yaml
@@ -60,7 +60,7 @@ spec:
       name: ${ cr.metadata.name.asString }
   - name: vm-data
     persistentVolumeClaim:
-      claimName: ${ cr.metadata.name.asString }-data
+      claimName: ${ cr.metadata.name.asString }-runner-data
   <#assign diskCounter = 0/>
   <#list cr.spec.vm.disks.asList() as disk>
   <#if disk.volumeClaimTemplate.metadata??
diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
index b038442..fd12b51 100644
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
@@ -132,7 +132,7 @@ public class Reconciler extends Component {
             WatchChannel channel)
             throws TemplateException, ApiException, IOException {
         // Combine template and data and parse result
-        var fmTemplate = fmConfig.getTemplate("vmDataPvc.ftl.yaml");
+        var fmTemplate = fmConfig.getTemplate("runnerDataPvc.ftl.yaml");
         StringWriter out = new StringWriter();
         fmTemplate.process(model, out);
         // Avoid Yaml.load due to