Merge pull request #471 from akutz/feature/cloud-provider-config

Centralized cloud provider configuration

Author: k8s-ci-robot

cmd/clusterctl/examples/vsphere/cluster.yaml.template

@@ -18,3 +18,18 @@ spec:
       password: "${VSPHERE_PASSWORD}"
       sshAuthorizedKeys:
       - "${SSH_AUTHORIZED_KEY}"
+      cloudProviderConfiguration:
+        global:
+          secretName: "cloud-provider-vsphere-credentials"
+          secretNamespace: "kube-system"
+        virtualCenter:
+          "${VSPHERE_SERVER}":
+            datacenters: "${VSPHERE_DATACENTER}"
+        network:
+          name: "${VSPHERE_NETWORK}"
+        workspace:
+          server: "${VSPHERE_SERVER}"
+          datacenter: "${VSPHERE_DATACENTER}"
+          datastore: "${VSPHERE_DATASTORE}"
+          resourcePool: "${VSPHERE_RESOURCE_POOL}"
+          folder: "${VSPHERE_FOLDER}"

cmd/clusterctl/examples/vsphere/machines.yaml.template

@@ -13,9 +13,6 @@ items:
         apiVersion: vsphere.cluster.k8s.io/v1alpha1
         kind: VsphereMachineProviderSpec
         datacenter: "${VSPHERE_DATACENTER}"
-        datastore: "${VSPHERE_DATASTORE}"
-        resourcePool: "${VSPHERE_RESOURCE_POOL}"
-        folder: "${VSPHERE_FOLDER}"
         network:
           devices:
           - networkName: "${VSPHERE_NETWORK}"