Switched back to linked clones and improved logging for WaitForDisk

Author: MaxwellCaron

internal/cloning/cloning_service.go

@@ -66,7 +66,6 @@ func (cs *CloningService) CloneTemplate(template string, targetName string, isGr
 	}
 
 	// 2. Check if the template has already been cloned by the user
-
 	// Extract template name from pool name (remove kamino_template_ prefix)
 	templateName := strings.TrimPrefix(template, "kamino_template_")
 
@@ -130,14 +129,14 @@ func (cs *CloningService) CloneTemplate(template string, targetName string, isGr
 		}
 	}
 
-	newRouter, err := cs.ProxmoxService.CloneVM(*router, newPoolName, true) // Always use full clone for routers
+	newRouter, err := cs.ProxmoxService.CloneVM(*router, newPoolName)
 	if err != nil {
 		errors = append(errors, fmt.Sprintf("failed to clone router VM: %v", err))
 	}
 
 	// Clone each VM to new pool
 	for _, vm := range templateVMs {
-		_, err := cs.ProxmoxService.CloneVM(vm, newPoolName, cs.Config.UseFullClones)
+		_, err := cs.ProxmoxService.CloneVM(vm, newPoolName)
 		if err != nil {
 			errors = append(errors, fmt.Sprintf("failed to clone VM %s: %v", vm.Name, err))
 		}

internal/cloning/types.go

@@ -22,7 +22,6 @@ type Config struct {
 	WANScriptPath     string        `envconfig:"WAN_SCRIPT_PATH" default:"/home/update-wan-ip.sh"`
 	VIPScriptPath     string        `envconfig:"VIP_SCRIPT_PATH" default:"/home/update-wan-vip.sh"`
 	WANIPBase         string        `envconfig:"WAN_IP_BASE" default:"172.16."`
-	UseFullClones     bool          `envconfig:"USE_FULL_CLONES" default:"false"`
 }
 
 // KaminoTemplate represents a template in the system

internal/proxmox/types.go

@@ -42,7 +42,7 @@ type Service interface {
 	StopVM(node string, vmID int) error
 	DeleteVM(node string, vmID int) error
 	ConvertVMToTemplate(node string, vmID int) error
-	CloneVM(sourceVM VM, newPoolName string, useFullClone bool) (*VM, error)
+	CloneVM(sourceVM VM, newPoolName string) (*VM, error)
 	WaitForCloneCompletion(vm *VM, timeout time.Duration) error
 	WaitForDisk(node string, vmid int, maxWait time.Duration) error
 	WaitForRunning(vm VM) error

internal/proxmox/vms.go

@@ -2,6 +2,7 @@ package proxmox
 
 import (
 	"fmt"
+	"log"
 	"math"
 	"strconv"
 	"strings"
@@ -76,7 +77,7 @@ func (s *ProxmoxService) ConvertVMToTemplate(node string, vmID int) error {
 	return nil
 }
 
-func (s *ProxmoxService) CloneVM(sourceVM VM, newPoolName string, useFullClone bool) (*VM, error) {
+func (s *ProxmoxService) CloneVM(sourceVM VM, newPoolName string) (*VM, error) {
 	// Get next available VMID
 	req := tools.ProxmoxAPIRequest{
 		Method:   "GET",
@@ -99,18 +100,12 @@ func (s *ProxmoxService) CloneVM(sourceVM VM, newPoolName string, useFullClone b
 		return nil, fmt.Errorf("failed to find best node: %w", err)
 	}
 
-	// Determine clone type based on parameter
-	cloneType := 0 // Linked clone by default
-	if useFullClone {
-		cloneType = 1 // Full clone
-	}
-
 	// Clone VM
 	cloneBody := map[string]any{
 		"newid":  newVMID,
 		"name":   sourceVM.Name,
 		"pool":   newPoolName,
-		"full":   cloneType, // Use configurable clone type
+		"full":   0, // Linked clone
 		"target": bestNode,
 	}
 
@@ -181,18 +176,14 @@ func (s *ProxmoxService) WaitForDisk(node string, vmid int, maxWait time.Duratio
 		time.Sleep(2 * time.Second)
 
 		configResp, err := s.getVMConfig(node, vmid)
+		log.Printf("Disk check for VM %d on node %s: %+v (err: %v)", vmid, node, configResp, err)
 		if err != nil {
 			continue
 		}
 
 		if configResp.HardDisk != "" {
-			// Additional check: try to get VM status to ensure disk is actually accessible
-			_, statusErr := s.getVMStatus(node, vmid)
-			if statusErr == nil {
-				// Wait a bit more for linked clone dependencies to be fully ready
-				time.Sleep(5 * time.Second)
-				return nil // Disk is available and VM is accessible
-			}
+			log.Printf("Disk for VM %d on node %s is available", vmid, node)
+			return nil // Disk is available
 		}
 	}