From 10c5487ad7b752c816b31fb6dfd1f2962eb26724 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 20 Oct 2017 00:39:17 -0700 Subject: [PATCH] Add docs corrections for versions and log output --- docs/aws.md | 2 +- docs/bare-metal.md | 15 +++++++-------- docs/digital-ocean.md | 2 +- docs/google-cloud.md | 8 ++++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/docs/aws.md b/docs/aws.md index d7526344..bbb12824 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -125,7 +125,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.0 (update) ``` Plan the resources to be created. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index 7dc0448f..d830d461 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -162,7 +162,7 @@ module "bare-metal-mercury" { # install matchbox_http_endpoint = "http://matchbox.example.com" container_linux_channel = "stable" - container_linux_version = "1465.6.0" + container_linux_version = "1520.6.0" ssh_authorized_key = "ssh-rsa AAAAB3Nz..." # cluster @@ -219,7 +219,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.0 (update) ``` Plan the resources to be created. @@ -232,12 +232,10 @@ Plan: 55 to add, 0 to change, 0 to destroy. Apply the changes. Terraform will generate bootkube assets to `asset_dir` and create Matchbox profiles (e.g. controller, worker) and matching rules via the Matchbox API. ```sh -module.bare-metal-mercury.null_resource.copy-secrets.0: Provisioning with 'file'... -module.bare-metal-mercury.null_resource.copy-secrets.2: Provisioning with 'file'... -module.bare-metal-mercury.null_resource.copy-secrets.1: Provisioning with 'file'... -module.bare-metal-mercury.null_resource.copy-secrets.0: Still creating... (10s elapsed) -module.bare-metal-mercury.null_resource.copy-secrets.2: Still creating... (10s elapsed) -module.bare-metal-mercury.null_resource.copy-secrets.1: Still creating... (10s elapsed) +module.bare-metal-mercury.null_resource.copy-kubeconfig.0: Provisioning with 'file'... +module.bare-metal-mercury.null_resource.copy-etcd-secrets.0: Provisioning with 'file'... +module.bare-metal-mercury.null_resource.copy-kubeconfig.0: Still creating... (10s elapsed) +module.bare-metal-mercury.null_resource.copy-etcd-secrets.0: Still creating... (10s elapsed) ... ``` @@ -357,4 +355,5 @@ Learn about [version pinning](concepts.md#versioning), maintenance, and [addons] | network_mtu | CNI interface MTU (calico-only) | 1480 | - | | pod_cidr | CIDR range to assign to Kubernetes pods | "10.2.0.0/16" | "10.22.0.0/16" | | service_cidr | CIDR range to assgin to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" | +| kernel_args | Additional kernel args to provide at PXE boot | [] | "kvm-intel.nested=1" | diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 41e8a7f9..24d517d0 100644 --- a/docs/digital-ocean.md +++ b/docs/digital-ocean.md @@ -114,7 +114,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.8.0 (update) ``` Plan the resources to be created. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 8936855b..dd00337b 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -1,6 +1,6 @@ # Google Cloud -In this tutorial, we'll create a Kubernetes v1.8.1 cluster on Google Compute Engine (not GKE). +In this tutorial, we'll create a Kubernetes v1.7.7 cluster on Google Compute Engine (not GKE). We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a network, firewall rules, managed instance groups of Kubernetes controllers and workers, network load balancers for controllers and workers, and health checks will be created. @@ -154,9 +154,9 @@ In 5-10 minutes, the Kubernetes cluster will be ready. $ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-1682.c.example-com.internal Ready 6m v1.8.1+coreos.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.8.1+coreos.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.8.1+coreos.0 +yavin-controller-1682.c.example-com.internal Ready 6m v1.7.7+coreos.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.7+coreos.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.7+coreos.0 ``` List the pods.