fixed clean-slate-deployment of VMs

Author: Wulf Thimm

.werft/jobs/build/prepare.ts

@@ -19,8 +19,9 @@ export async function prepare(werft: Werft, config: JobConfig) {
         configureDocker()
         configureCoreDevAccess()
         werft.done(prepareSlices.CONFIGURE_CORE_DEV)
-
-        decideHarvesterVMCreation(werft, config)
+        if (config.withVM) {
+            prepareVM(werft, config)
+        }
     } catch (err) {
         werft.fail(phaseName, err);
     }
@@ -62,21 +63,15 @@ function configureCoreDevAccess() {
     }
 }
 
-function decideHarvesterVMCreation(werft: Werft, config: JobConfig) {
-    if (config.withVM && !VM.vmExists({ name: config.previewEnvironment.destname })) {
-        prepareVM(werft, config)
-    } else {
-        werft.currentPhaseSpan.setAttribute("werft.harvester.created_vm", false)
-    }
-    werft.done(prepareSlices.BOOT_VM)
-}
-
 function prepareVM(werft: Werft, config: JobConfig) {
-    if (config.cleanSlateDeployment) {
+    if (config.cleanSlateDeployment && VM.vmExists({ name: config.previewEnvironment.destname })) {
         werft.log(prepareSlices.BOOT_VM, "Cleaning previously created VM")
         VM.deleteVM({ name: config.previewEnvironment.destname })
     }
-    createVM(werft, config, prepareSlices.BOOT_VM)
+    if (!VM.vmExists({ name: config.previewEnvironment.destname })) {
+        werft.log(prepareSlices.BOOT_VM, "Creating VM")
+        createVM(werft, config, prepareSlices.BOOT_VM)
+    }
 }
 
 // createVM only triggers the VM creation.

.werft/vm/vm.ts

@@ -114,8 +114,7 @@ export function startVM(options: { name: string }) {
  * @returns true if the VM already exists
  */
 export function vmExists(options: { name: string }) {
-    const namespace = `preview-${options.name}`
-    const status = exec(`kubectl --kubeconfig ${KUBECONFIG_PATH} -n ${namespace} get vmi ${options.name}`, { dontCheckRc: true, silent: true })
+    const status = exec(`kubectl --kubeconfig ${KUBECONFIG_PATH} -n preview-${options.name} get vmi ${options.name}`, { dontCheckRc: true, silent: true })
     return status.code == 0
 }