Skip to content

Commit a71ea8a

Browse files
author
Matt Nikkel
committed
Clarify conditional requirements
1 parent 2628231 commit a71ea8a

File tree

1 file changed

+10
-8
lines changed
  • content/rke/latest/en/config-options/cloud-providers/vsphere/config-reference

1 file changed

+10
-8
lines changed

content/rke/latest/en/config-options/cloud-providers/vsphere/config-reference/_index.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,16 @@ Each vCenter is defined by adding a new entry under the `virtual_center` directi
7777

7878
| virtual_center Options | Type | Required | Description |
7979
|:----------------------:|:--------:|:---------:|:-----------|
80-
| user | string | + | vCenter/ESXi user used to authenticate with this server. |
81-
| password | string | + | User's password. |
82-
| secret-name | string | | Name of secret resource containing credential key/value pairs. `+` Can be specified in lieu of user/password parameters. |
83-
| secret-namespace | string | | Namespace in which the secret resource was created in. `+` Can be specified in lieu of user/password parameters. |
80+
| user | string | * | vCenter/ESXi user used to authenticate with this server. |
81+
| password | string | * | User's password. |
82+
| secret-name | string | * | Name of secret resource containing credential key/value pairs. Can be specified in lieu of user/password parameters. |
83+
| secret-namespace | string | * | Namespace in which the secret resource was created in. Can be specified in lieu of user/password parameters. |
8484
| port | string | | Port to use to connect to this server. Defaults to 443. |
85-
| datacenters | string | * | Comma-separated list of all datacenters in which cluster nodes are running in. |
85+
| datacenters | string | | Comma-separated list of all datacenters in which cluster nodes are running in. |
8686
| soap-roundtrip-count | uint | | Round tripper count for API requests to the vCenter (num retries = value - 1). |
8787

88+
\* Either `secret-name` and `secret-namespace` OR `user` and `password` are required; `secret-name` and `secret-namespace` will take precedence if all are set.
89+
8890
> The following additional options (introduced in Kubernetes v1.11) are not yet supported in RKE.
8991

9092
| virtual_center Options | Type | Required | Description |
@@ -110,9 +112,9 @@ The following configuration options are available:
110112

111113
| workspace Options | Type | Required | Description |
112114
|:----------------------:|:--------:|:---------:|:---------|
113-
| server | string | * | IP or FQDN of the vCenter/ESXi that should be used for creating the volumes. Must match one of the vCenters defined under the `virtual_center` directive.|
114-
| datacenter | string | * | Name of the datacenter that should be used for creating volumes. For ESXi enter *ha-datacenter*.|
115-
| folder | string | * | Path of folder in which to create dummy VMs used for volume provisioning (relative from the root folder in vCenter), e.g. "vm/kubernetes".|
115+
| server | string | | IP or FQDN of the vCenter/ESXi that should be used for creating the volumes. Must match one of the vCenters defined under the `virtual_center` directive.|
116+
| datacenter | string | | Name of the datacenter that should be used for creating volumes. For ESXi enter *ha-datacenter*.|
117+
| folder | string | | Path of folder in which to create dummy VMs used for volume provisioning (relative from the root folder in vCenter), e.g. "vm/kubernetes".|
116118
| default-datastore | string | | Name of default datastore to place VMDKs if neither datastore or storage policy are specified in the volume options of a PVC. If datastore is located in a storage folder or is a member of a datastore cluster, specify the full path. |
117119
| resourcepool-path | string | | Absolute or relative path to the resource pool where the dummy VMs for [Storage policy based provisioning](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/policy-based-mgmt.html) should be created. If a relative path is specified, it is resolved with respect to the datacenter's *host* folder. Examples: `/<dataCenter>/host/<hostOrClusterName>/Resources/<poolName>`, `Resources/<poolName>`. For standalone ESXi specify `Resources`. |
118120

0 commit comments

Comments
 (0)