Fix default-datastore bug in cloud conf

This patch fixes an issue with the way the cloud provider
configuration's workspace datastore was being processed.

Author: akutz

config/crds/vsphere_v1alpha1_vsphereclusterproviderspec.yaml

@@ -134,7 +134,7 @@ spec:
                 datacenter:
                   description: Datacenter is the datacenter in which VMs are created/located.
                   type: string
-                defaultDatastore:
+                datastore:
                   description: Datastore is the datastore in which VMs are created/located.
                   type: string
                 folder:

pkg/apis/vsphere/v1alpha1/cloud/encoding_test.go

@@ -54,6 +54,7 @@ var twoWayCodecTestCases = []codecTestCase{
 		server = 0.0.0.0
 		datacenter = us-west
 		folder = kubernetes
+		default-datastore = default
 		`,
 		configObj: cloud.Config{
 			Global: cloud.GlobalConfig{
@@ -68,6 +69,7 @@ var twoWayCodecTestCases = []codecTestCase{
 				Server:     "0.0.0.0",
 				Datacenter: "us-west",
 				Folder:     "kubernetes",
+				Datastore:  "default",
 			},
 		},
 	},

pkg/apis/vsphere/v1alpha1/cloud/types.go

@@ -179,7 +179,7 @@ type WorkspaceConfig struct {
 
 	// Datastore is the datastore in which VMs are created/located.
 	// +optional
-	Datastore string `gcfg:"default-datastore,omitempty" json:"defaultDatastore,omitempty"`
+	Datastore string `gcfg:"default-datastore,omitempty" json:"datastore,omitempty"`
 
 	// ResourcePool is the resource pool in which VMs are created/located.
 	// +optional

scripts/e2e/bootstrap_job/spec/cluster.template

@@ -20,6 +20,7 @@ spec:
         global:
           secretName: "cloud-provider-vsphere-credentials"
           secretNamespace: "kube-system"
+          insecure: true
         virtualCenter:
           "$VSPHERE_SERVER":
         network:

scripts/e2e/bootstrap_job/spec/provider-components.template

@@ -141,7 +141,7 @@ spec:
                 datacenter:
                   description: Datacenter is the datacenter in which VMs are created/located.
                   type: string
-                defaultDatastore:
+                datastore:
                   description: Datastore is the datastore in which VMs are created/located.
                   type: string
                 folder: