Improve the template and error logs

Author: mcbenjemaa

internal/service/vmservice/bootstrap.go

@@ -102,7 +102,7 @@ func injectCloudInit(ctx context.Context, machineScope *scope.MachineScope, boot
 	injector := getISOInjector(machineScope.VirtualMachine, bootstrapData, metadata, network)
 	if err := injector.Inject(ctx, inject.CloudConfigFormat); err != nil {
 		conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
-		return errors.Wrap(err, "cloud-init iso inject failed")
+		return err
 	}
 	return nil
 }
@@ -123,7 +123,7 @@ func injectIgnition(ctx context.Context, machineScope *scope.MachineScope, boots
 	injector := getIgnitionISOInjector(machineScope.VirtualMachine, metadata, enricher)
 	if err := injector.Inject(ctx, inject.IgnitionFormat); err != nil {
 		conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
-		return errors.Wrap(err, "ignition iso inject failed")
+		return err
 	}
 	return nil
 }

internal/service/vmservice/bootstrap_test.go

@@ -130,7 +130,7 @@ func TestReconcileBootstrapData_BadInjector(t *testing.T) {
 
 	requeue, err := reconcileBootstrapData(context.Background(), machineScope)
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "cloud-init iso inject failed: bad FakeISOInjector")
+	require.Contains(t, err.Error(), "failed to inject bootstrap data: bad FakeISOInjector")
 	require.False(t, requeue)
 	require.True(t, conditions.Has(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition))
 	require.Nil(t, machineScope.ProxmoxMachine.Status.BootstrapDataProvided)

test/e2e/config/proxmox-dev.yaml

@@ -82,17 +82,17 @@ providers:
       - sourcePath: "${PWD}/test/e2e/data/infrastructure-proxmox/cluster-template-flatcar.yaml"
 
 variables:
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.31.6}"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.32.2}"
   CONTROL_PLANE_MACHINE_COUNT: "${CONTROL_PLANE_MACHINE_COUNT:-1}"
   WORKER_MACHINE_COUNT: "${WORKER_MACHINE_COUNT:-2}"
   EXP_CLUSTER_RESOURCE_SET: "true"
   # Cluster Addons
   CNI: "${PWD}/test/e2e/data/cni/calico.yaml"
 
   PROXMOX_SOURCENODE: "${PROXMOX_SOURCENODE:-stg-ceph01}"
-  TEMPLATE_VMID: "${TEMPLATE_VMID:-164}"
+  TEMPLATE_VMID: "${TEMPLATE_VMID:-187}"
   TEMPLATE_VMID_FLATCAR: "${TEMPLATE_VMID_FLATCAR:-202}"
-  VM_SSH_KEYS: ""
+  VM_SSH_KEYS: "ssh-ed25519 ..."
   NODE_IP_RANGES: "[10.4.18.104-10.4.18.125]"
   GATEWAY: "10.4.18.1"
   IP_PREFIX: "25"

test/e2e/data/infrastructure-proxmox/cluster-template-ci.yaml

@@ -153,7 +153,6 @@ spec:
         owner: root:root
         permissions: "0700"
     preKubeadmCommands:
-      - echo "127.0.0.1   localhost kubernetes {{ ds.meta_data.hostname }}" >>/etc/hosts
       - /etc/kube-vip-prepare.sh
     initConfiguration:
       nodeRegistration: