whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #855 from MikeSpreitzer/docfixtoo

Browse Source 
Fixed rkt/cni typo and noted use of ca-key.pem for worker
This commit is contained in:
Phillip Wittrock
2016-07-18 14:49:42 -07:00
committed by GitHub
parent d25272f8fd 7053058632
commit da0c5441c9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/getting-started-guides/ubuntu-calico.md
+3 -3
View File
@@ -175,7 +175,7 @@ The following steps should be run on each Kubernetes node.
### Configure TLS ### Configure TLS
Worker nodes require three keys: `ca.pem`, `worker.pem`, and `worker-key.pem`. We've already generated Worker nodes require three keys: `ca.pem`, `worker.pem`, and `worker-key.pem`. We've already generated
`ca.pem` for use on the Master. The worker public/private keypair should be generated for each Kubernetes node. `ca.pem` and `ca-key.pem` for use on the Master. The worker public/private keypair should be generated for each Kubernetes node.
1. Create the file `worker-openssl.cnf` with the following contents. 1. Create the file `worker-openssl.cnf` with the following contents.
@@ -192,7 +192,7 @@ Worker nodes require three keys: `ca.pem`, `worker.pem`, and `worker-key.pem`.
IP.1 = $ENV::WORKER_IP IP.1 = $ENV::WORKER_IP
``` ```
2. Generate the necessary TLS assets for this worker. This relies on the worker's IP address, and the `ca.pem` file generated earlier in the guide. 2. Generate the necessary TLS assets for this worker. This relies on the worker's IP address, and the `ca.pem` and `ca-key.pem` files generated earlier in the guide.
```shell ```shell
# Export this worker's IP address. # Export this worker's IP address.
@@ -304,7 +304,7 @@ On your compute nodes, it is important that you install Calico before Kubernetes
mkdir -p /etc/cni/net.d mkdir -p /etc/cni/net.d
# Make the network configuration file # Make the network configuration file
cat >/etc/rkt/net.d/10-calico.conf <<EOF cat >/etc/cni/net.d/10-calico.conf <<EOF
{ {
"name": "calico-k8s-network", "name": "calico-k8s-network",
"type": "calico", "type": "calico",