From 5d5b0c07c582324d3e483eccf8ef603c6b79428b Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Wed, 9 Aug 2023 21:56:30 +0200
Subject: [PATCH] Use names with dash for k8s, but not for directories.

---
 .../src/org/jdrupes/vmoperator/manager/Constants.java       | 4 ++--
 .../src/org/jdrupes/vmoperator/manager/Manager.java         | 6 +++---
 .../src/org/jdrupes/vmoperator/manager/VmWatcher.java       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Constants.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Constants.java
index 8ace35f..d1482b6 100644
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Constants.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Constants.java
@@ -24,7 +24,7 @@ package org.jdrupes.vmoperator.manager;
 public class Constants {
 
     /** The Constant VM_OP_NAME. */
-    public static final String VM_OP_NAME = "vmoperator";
+    public static final String VM_OP_NAME = "vm-operator";
 
     /** The Constant VM_OP_GROUP. */
     public static final String VM_OP_GROUP = "vmoperator.jdrupes.org";
@@ -33,7 +33,7 @@ public class Constants {
     public static final String VM_OP_KIND_VM = "VirtualMachine";
 
     /** The Constant APP_NAME. */
-    public static final String APP_NAME = "vmrunner";
+    public static final String APP_NAME = "vm-runner";
 
     /** The Constant STATE_RUNNING. */
     public static final String STATE_RUNNING = "Running";
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 d4defbb..1ee406c 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
@@ -63,7 +63,7 @@ public class Manager extends Component {
 
         // Configuration store with file in /etc/opt (default)
         File config = new File(cmdLine.getOptionValue('c',
-            "/etc/opt/" + VM_OP_NAME + "/config.yaml"));
+            "/etc/opt/" + VM_OP_NAME.replace("-", "") + "/config.yaml"));
         // Don't rely on night config to produce a good exception
         // for this simple case
         if (!Files.isReadable(config.toPath())) {
@@ -86,8 +86,8 @@ public class Manager extends Component {
     static {
         try {
             InputStream props;
-            var path
-                = FsdUtils.findConfigFile(VM_OP_NAME, "logging.properties");
+            var path = FsdUtils.findConfigFile(VM_OP_NAME.replace("-", ""),
+                "logging.properties");
             if (path.isPresent()) {
                 props = Files.newInputStream(path.get());
             } else {
diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
index 922fafb..eb0c53e 100644
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java
@@ -118,8 +118,8 @@ public class VmWatcher extends Component {
 
         ListOptions opts = new ListOptions();
         opts.setLabelSelector(
-            "app.kubernetes.io/managed-by=vmoperator,"
-                + "app.kubernetes.io/name=vmrunner");
+            "app.kubernetes.io/managed-by=" + Constants.VM_OP_NAME + ","
+                + "app.kubernetes.io/name=" + Constants.APP_NAME);
         for (String resource : List.of("apps/v1/statefulsets",
             "v1/configmaps", "v1/secrets")) {
             var resParts = new LinkedList<>(List.of(resource.split("/")));