Merge pull request #2575 from bruceauyeung/patch-4

dedent yaml code blocks
reviewable/pr2572/r1^2
Joe Beda 2017-02-20 10:33:40 -08:00 committed by GitHub
commit 1d1f2a8696
1 changed files with 40 additions and 40 deletions

View File

@ -180,49 +180,49 @@ available as configuration file options.
### Sample Master Configuration ### Sample Master Configuration
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1alpha1 apiVersion: kubeadm.k8s.io/v1alpha1
kind: MasterConfiguration kind: MasterConfiguration
api: api:
advertiseAddresses: advertiseAddresses:
- <address1|string> - <address1|string>
- <address2|string> - <address2|string>
bindPort: <int> bindPort: <int>
externalDNSNames: externalDNSNames:
- <dnsname1|string> - <dnsname1|string>
- <dnsname2|string> - <dnsname2|string>
authorizationMode: <string> authorizationMode: <string>
cloudProvider: <string> cloudProvider: <string>
discovery: discovery:
bindPort: <int> bindPort: <int>
etcd: etcd:
endpoints: endpoints:
- <endpoint1|string> - <endpoint1|string>
- <endpoint2|string> - <endpoint2|string>
caFile: <path|string> caFile: <path|string>
certFile: <path|string> certFile: <path|string>
keyFile: <path|string> keyFile: <path|string>
kubernetesVersion: <string> kubernetesVersion: <string>
networking: networking:
dnsDomain: <string> dnsDomain: <string>
serviceSubnet: <cidr> serviceSubnet: <cidr>
podSubnet: <cidr> podSubnet: <cidr>
secrets: secrets:
givenToken: <token|string> givenToken: <token|string>
``` ```
### Sample Node Configuration ### Sample Node Configuration
```yaml ```yaml
apiVersion: kubeadm.k8s.io/v1alpha1 apiVersion: kubeadm.k8s.io/v1alpha1
kind: NodeConfiguration kind: NodeConfiguration
apiPort: <int> apiPort: <int>
discoveryPort: <int> discoveryPort: <int>
masterAddresses: masterAddresses:
- <master1> - <master1>
secrets: secrets:
givenToken: <token|string> givenToken: <token|string>
``` ```
## Automating kubeadm ## Automating kubeadm