From 628d0f15dd7499a15b7ae1a00441a72191b130be Mon Sep 17 00:00:00 2001 From: Pavel Boldyrev <627562+bpg@users.noreply.github.com> Date: Thu, 11 Apr 2024 23:13:29 -0400 Subject: [PATCH] fix(vm): regression: force VM recreation due to `initialization.upgrade` when it is not in the plan (#1209) Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com> --- proxmoxtf/resource/vm/vm.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/proxmoxtf/resource/vm/vm.go b/proxmoxtf/resource/vm/vm.go index 37120129..7cfe194b 100644 --- a/proxmoxtf/resource/vm/vm.go +++ b/proxmoxtf/resource/vm/vm.go @@ -90,6 +90,7 @@ const ( dvInitializationNetworkDataFileID = "" dvInitializationMetaDataFileID = "" dvInitializationType = "" + dvInitializationUpgrade = true dvKeyboardLayout = "en-us" dvKVMArguments = "" dvMachineType = "" @@ -900,10 +901,9 @@ func VM() *schema.Resource { }, mkInitializationUpgrade: { Type: schema.TypeBool, - Description: "Whether to upgrade the cloud-init configuration", + Description: "Whether to do an automatic package upgrade after the first boot", Optional: true, - ForceNew: true, - Default: true, + Default: dvInitializationUpgrade, }, }, }, @@ -3723,13 +3723,10 @@ func vmReadCustom( diags = append(diags, diag.FromErr(err)...) } - //////////////////// allDiskInfo := disk.GetInfo(vmConfig, d) // from the cloned VM diags = append(diags, disk.Read(ctx, d, allDiskInfo, vmID, api, nodeName, len(clone) > 0)...) - //////////////////////////// - if vmConfig.EFIDisk != nil { efiDisk := map[string]interface{}{} @@ -4124,8 +4121,8 @@ func vmReadCustom( if vmConfig.CloudInitUpgrade != nil { initialization[mkInitializationUpgrade] = *vmConfig.CloudInitUpgrade - } else { - initialization[mkInitializationUpgrade] = false + } else if len(initialization) > 0 { + initialization[mkInitializationUpgrade] = dvInitializationUpgrade } currentInitialization := d.Get(mkInitialization).([]interface{})