From 7053058632883f3753357be8437b1fa4ccd1c7a9 Mon Sep 17 00:00:00 2001 From: Mike Spreitzer Date: Fri, 15 Jul 2016 12:00:34 -0400 Subject: [PATCH] Fixed rkt/cni typo and noted use of ca-key.pem for worker Fixed a typo and an oversight in the instructions for deploying Kubernetes with Calico on Ubuntu. Fixes #614 Fixes #616 --- docs/getting-started-guides/ubuntu-calico.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/ubuntu-calico.md b/docs/getting-started-guides/ubuntu-calico.md index fb12cae859..4ebb225388 100644 --- a/docs/getting-started-guides/ubuntu-calico.md +++ b/docs/getting-started-guides/ubuntu-calico.md @@ -175,7 +175,7 @@ The following steps should be run on each Kubernetes node. ### Configure TLS 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. @@ -192,7 +192,7 @@ Worker nodes require three keys: `ca.pem`, `worker.pem`, and `worker-key.pem`. 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 # 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 # Make the network configuration file - cat >/etc/rkt/net.d/10-calico.conf </etc/cni/net.d/10-calico.conf <