diff --git a/docs/01-prerequisites.md b/docs/01-prerequisites.md index c9073ce..95679b5 100644 --- a/docs/01-prerequisites.md +++ b/docs/01-prerequisites.md @@ -59,6 +59,9 @@ oci iam compartment create --name kubernetes-the-hard-way --description "Kuberne --compartment-id --region ``` +Note that by specifying your tenancy OCID as the `--compartment-id` in the above command, you will be +creating your compartment under the _root_ compartment of your tenancy. + ### Set this Compartment as the Default Note the compartment `id` from the output of the above command, and create a file `~/.oci/oci_cli_rc` with diff --git a/docs/02-client-tools.md b/docs/02-client-tools.md index 88a9f27..94cfed2 100644 --- a/docs/02-client-tools.md +++ b/docs/02-client-tools.md @@ -204,7 +204,7 @@ function oci-scp(){ For convenience throughout the rest of this tutorial, you can copy the above functions into your shell's profile, to avoid having to redefine them in each of the various tmux terminals we'll create. For example, for Bash shell, copy and past the above functions into `~/.bashrc`, then refresh the profile from your current terminal session with: -```` +``` . ~/.bashrc ``` diff --git a/docs/03-compute-resources.md b/docs/03-compute-resources.md index 0857669..9d83542 100644 --- a/docs/03-compute-resources.md +++ b/docs/03-compute-resources.md @@ -1,6 +1,6 @@ # Provisioning Compute Resources -Kubernetes requires a set of machines to host the Kubernetes control plane and the worker nodes where containers are ultimately run. In this lab you will provision the compute resources required for running a secure and highly available Kubernetes cluster across a single [compute zone](https://cloud.google.com/compute/docs/regions-zones/regions-zones). +Kubernetes requires a set of machines to host the Kubernetes control plane and the worker nodes where containers are ultimately run. In this lab you will provision the compute resources required for running a secure and highly available Kubernetes cluster, spread across the [Availability Domains and Fault Domains](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) of a single OCI [Region](https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm). > Ensure a default compute zone and region have been set as described in the [Prerequisites](01-prerequisites.md#set-a-default-compute-region-and-zone) lab. @@ -12,7 +12,7 @@ The Kubernetes [networking model](https://kubernetes.io/docs/concepts/cluster-ad ### Virtual Cloud Network -In this section a dedicated [Virtual Cloud Network](https://www.oracle.com/cloud/networking/virtual-cloud-network/) (VCN) network will be setup to host the Kubernetes cluster. +In this section a dedicated [Virtual Cloud Network](https://www.oracle.com/cloud/networking/virtual-cloud-network/) (VCN) will be setup to host the Kubernetes cluster. Create the `kubernetes-the-hard-way` custom VCN: @@ -158,7 +158,7 @@ oci compute instance list --sort-by DISPLAYNAME --lifecycle-state RUNNING --all } ``` -Rerun the above command until all of the compute instances we created are listed above as "Running". +Rerun the above command until all of the compute instances we created are listed as "Running", before continuing on to the next section. ## Verifying SSH Access diff --git a/docs/07-bootstrapping-etcd.md b/docs/07-bootstrapping-etcd.md index 9c703b6..7c1c096 100644 --- a/docs/07-bootstrapping-etcd.md +++ b/docs/07-bootstrapping-etcd.md @@ -14,7 +14,7 @@ oci-ssh controller-0 [tmux](https://github.com/tmux/tmux/wiki) can be used to run commands on multiple compute instances at the same time. See the [Running commands in parallel with tmux](01-prerequisites.md#running-commands-in-parallel-with-tmux) section in the Prerequisites lab. -**Note**: Please ensure you've imported the shell functions defined [here](02-client-tools.md#shell-functions), either within your shell profile or explicitly within each tmux window/pane. +**Note**: Please ensure you've imported the shell functions defined [here](02-client-tools.md#shell-helper-functions), either within your shell profile or explicitly within each tmux window/pane. ## Required Tools diff --git a/docs/08-bootstrapping-kubernetes-controllers.md b/docs/08-bootstrapping-kubernetes-controllers.md index 2b19920..3f3b29f 100644 --- a/docs/08-bootstrapping-kubernetes-controllers.md +++ b/docs/08-bootstrapping-kubernetes-controllers.md @@ -14,7 +14,7 @@ oci-ssh controller-0 [tmux](https://github.com/tmux/tmux/wiki) can be used to run commands on multiple compute instances at the same time. See the [Running commands in parallel with tmux](01-prerequisites.md#running-commands-in-parallel-with-tmux) section in the Prerequisites lab. -**Note**: please import the shell functions defined [here](02-client-tools.md#shell-functions) in each tmux window/pane, as we will make use of them. +**Note**: please import the shell functions defined [here](02-client-tools.md#shell-helper-functions) in each tmux window/pane, as we will make use of them. ## Provision the Kubernetes Control Plane diff --git a/docs/09-bootstrapping-kubernetes-workers.md b/docs/09-bootstrapping-kubernetes-workers.md index 8926e59..8573de3 100644 --- a/docs/09-bootstrapping-kubernetes-workers.md +++ b/docs/09-bootstrapping-kubernetes-workers.md @@ -14,7 +14,7 @@ oci-ssh worker-0 [tmux](https://github.com/tmux/tmux/wiki) can be used to run commands on multiple compute instances at the same time. See the [Running commands in parallel with tmux](01-prerequisites.md#running-commands-in-parallel-with-tmux) section in the Prerequisites lab. -**Note**: Please ensure you've imported the shell functions defined [here](02-client-tools.md#shell-functions), either within your shell profile or explicitly within each tmux window/pane. +**Note**: Please ensure you've imported the shell functions defined [here](02-client-tools.md#shell-helper-functions), either within your shell profile or explicitly within each tmux window/pane. ## Provisioning a Kubernetes Worker Node