Merge pull request #357 from andrewsykim/vsphere-cloud-provider

userdata: use VM Folder in cloud config

Author: k8s-ci-robot

pkg/cloud/vsphere/services/govmomi/create.go

@@ -103,6 +103,7 @@ func generateUserData(ctx *context.MachineContext, bootstrapToken string) ([]byt
 			Server:       ctx.ClusterConfig.VsphereServer,
 			Datacenter:   ctx.MachineConfig.MachineSpec.Datacenter,
 			ResourcePool: ctx.MachineConfig.MachineSpec.ResourcePool,
+			Folder:       ctx.MachineConfig.MachineSpec.VMFolder,
 			Datastore:    ctx.MachineConfig.MachineSpec.Datastore,
 			// assume the first VM network found for the vSphere cloud provider
 			Network: ctx.MachineConfig.MachineSpec.Network.Devices[0].NetworkName,

pkg/cloud/vsphere/services/userdata/controlplane.go

@@ -35,7 +35,7 @@ password = "{{ .Password }}"
 [Workspace]
 server = "{{ .Server }}"
 datacenter = "{{ .Datacenter }}"
-folder = "{{ .ResourcePool }}"
+folder = "{{ .Folder }}"
 default-datastore = "{{ .Datastore }}"
 resourcepool-path = "{{ .ResourcePool }}"
 
@@ -258,6 +258,7 @@ type CloudConfigInput struct {
 	Server       string
 	Datacenter   string
 	ResourcePool string
+	Folder       string
 	Datastore    string
 	Network      string
 }

pkg/cloud/vsphere/services/userdata/controlplane_test.go

@@ -65,6 +65,7 @@ func Test_CloudConfig(t *testing.T) {
 				Server:       "10.0.0.1",
 				Datacenter:   "myprivatecloud",
 				ResourcePool: "deadpool",
+				Folder:       "vms",
 				Datastore:    "infinite-data",
 				Network:      "connected",
 			},
@@ -79,7 +80,7 @@ password = "so_secure"
 [Workspace]
 server = "10.0.0.1"
 datacenter = "myprivatecloud"
-folder = "deadpool"
+folder = "vms"
 default-datastore = "infinite-data"
 resourcepool-path = "deadpool"