Adjust vSphere tfvars and test definitions to use the correct template and folder (#3901)

* Backport vSphere terraform config from main

Signed-off-by: Artiom Diomin <[email protected]>

* Adjust vSphere tfvars and test definitions to use the correct template and folder

Signed-off-by: Artiom Diomin <[email protected]>

---------

Signed-off-by: Artiom Diomin <[email protected]>

Author: kron4eg

examples/terraform/vsphere/README.md

@@ -44,15 +44,15 @@ See the [Terraform loadbalancers in examples document][docs-tf-loadbalancer].
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_vsphere"></a> [vsphere](#requirement\_vsphere) | ~> 2.1.1 |
+| <a name="requirement_vsphere"></a> [vsphere](#requirement\_vsphere) | ~> 2.14.2 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_null"></a> [null](#provider\_null) | n/a |
 | <a name="provider_random"></a> [random](#provider\_random) | n/a |
-| <a name="provider_vsphere"></a> [vsphere](#provider\_vsphere) | ~> 2.1.1 |
+| <a name="provider_vsphere"></a> [vsphere](#provider\_vsphere) | ~> 2.14.2 |
 
 ## Modules
 
@@ -64,14 +64,14 @@ No modules.
 |------|------|
 | [null_resource.keepalived_config](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
 | [random_string.keepalived_auth_pass](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
-| [vsphere_compute_cluster_vm_anti_affinity_rule.vm_anti_affinity_rule](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/resources/compute_cluster_vm_anti_affinity_rule) | resource |
-| [vsphere_virtual_machine.control_plane](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/resources/virtual_machine) | resource |
-| [vsphere_compute_cluster.cluster](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/compute_cluster) | data source |
-| [vsphere_datacenter.dc](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/datacenter) | data source |
-| [vsphere_datastore.datastore](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/datastore) | data source |
-| [vsphere_network.network](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/network) | data source |
-| [vsphere_resource_pool.pool](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/resource_pool) | data source |
-| [vsphere_virtual_machine.template](https://registry.terraform.io/providers/hashicorp/vsphere/latest/docs/data-sources/virtual_machine) | data source |
+| [vsphere_compute_cluster_vm_anti_affinity_rule.vm_anti_affinity_rule](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/resources/compute_cluster_vm_anti_affinity_rule) | resource |
+| [vsphere_virtual_machine.control_plane](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/resources/virtual_machine) | resource |
+| [vsphere_compute_cluster.cluster](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/compute_cluster) | data source |
+| [vsphere_datacenter.dc](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/datacenter) | data source |
+| [vsphere_datastore.datastore](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/datastore) | data source |
+| [vsphere_network.network](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/network) | data source |
+| [vsphere_resource_pool.pool](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/resource_pool) | data source |
+| [vsphere_virtual_machine.template](https://registry.terraform.io/providers/vmware/vsphere/latest/docs/data-sources/virtual_machine) | data source |
 
 ## Inputs
 
@@ -95,6 +95,7 @@ No modules.
 | <a name="input_datastore_name"></a> [datastore\_name](#input\_datastore\_name) | datastore name | `string` | `"datastore1"` | no |
 | <a name="input_dc_name"></a> [dc\_name](#input\_dc\_name) | datacenter name | `string` | `"dc-1"` | no |
 | <a name="input_disk_size"></a> [disk\_size](#input\_disk\_size) | disk size | `number` | `50` | no |
+| <a name="input_enable_disk_uuid"></a> [enable\_disk\_uuid](#input\_enable\_disk\_uuid) | Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest | `bool` | `true` | no |
 | <a name="input_folder_name"></a> [folder\_name](#input\_folder\_name) | folder name | `string` | `"kubeone"` | no |
 | <a name="input_initial_machinedeployment_operating_system_profile"></a> [initial\_machinedeployment\_operating\_system\_profile](#input\_initial\_machinedeployment\_operating\_system\_profile) | Name of operating system profile for MachineDeployments, only applicable if operating-system-manager addon is enabled.<br>If not specified, the default value will be added by machine-controller addon. | `string` | `""` | no |
 | <a name="input_initial_machinedeployment_replicas"></a> [initial\_machinedeployment\_replicas](#input\_initial\_machinedeployment\_replicas) | Number of replicas per MachineDeployment | `number` | `2` | no |

examples/terraform/vsphere/main.tf

@@ -92,9 +92,7 @@ resource "vsphere_virtual_machine" "control_plane" {
     template_uuid = data.vsphere_virtual_machine.template.id
   }
 
-  extra_config = {
-    "disk.enableUUID" = "TRUE"
-  }
+  enable_disk_uuid = var.enable_disk_uuid
 
   vapp {
     properties = {

examples/terraform/vsphere/variables.tf

@@ -263,3 +263,9 @@ variable "ip_family" {
     error_message = "Unsupported IP Family specified."
   }
 }
+
+variable "enable_disk_uuid" {
+  default = true
+  type = bool
+  description = "Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest"
+}

examples/terraform/vsphere/versions.tf

@@ -18,8 +18,8 @@ terraform {
   required_version = ">= 1.0.0"
   required_providers {
     vsphere = {
-      source  = "hashicorp/vsphere"
-      version = "~> 2.1.1"
+      source  = "vmware/vsphere"
+      version = "~> 2.14.2"
     }
   }
 }

test/e2e/testdata/vsphere.tfvars

@@ -4,7 +4,7 @@ datastore_name       = "Datastore0-truenas"
 compute_cluster_name = "vSAN Cluster"
 network_name         = "VM Network"
 folder_name          = "KubeOne-E2E"
-template_name        = "kkp-ubuntu-24.04"
+template_name        = "kubeone-e2e-ubuntu-24.04"
 control_plane_memory = 4096
 worker_memory        = 4096
 disk_size            = 25

test/e2e/tests_definitions.go

@@ -908,7 +908,6 @@ var (
 				path:    "../../examples/terraform/vsphere",
 				varFile: "testdata/vsphere.tfvars",
 				vars: []string{
-					"template_name=kubeone-ubuntu-24.04",
 					"worker_os=ubuntu",
 					"ssh_username=ubuntu",
 				},
@@ -933,7 +932,6 @@ var (
 				path:    "../../../kubeone-stable/examples/terraform/vsphere",
 				varFile: "testdata/vsphere.tfvars",
 				vars: []string{
-					"template_name=kubeone-ubuntu-24.04",
 					"worker_os=ubuntu",
 					"ssh_username=ubuntu",
 				},

test/go-test-e2e.sh

@@ -158,9 +158,9 @@ cloudConfig: |
   [Workspace]
   server = "${VSPHERE_SERVER}"
   datacenter = "Hamburg"
-  default-datastore="vsan"
+  default-datastore="Datastore0-truenas"
   resourcepool-path=""
-  folder = "Kubermatic-ci"
+  folder = "KubeOne-E2E"
 
   [Disk]
   scsicontrollertype = pvscsi
@@ -180,9 +180,9 @@ csiConfig: |
   [Workspace]
   server = "${VSPHERE_SERVER}"
   datacenter = "Hamburg"
-  default-datastore="vsan"
+  default-datastore="Datastore0-truenas"
   resourcepool-path=""
-  folder = "Kubermatic-ci"
+  folder = "KubeOne-E2E"
 EOL
     ;;
   *)