From 0bc1cb8d77b5dd7bcdeca6586cb5c97f7f9404ab Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 4 Dec 2018 00:13:23 -0800 Subject: [PATCH] Update Kubernetes (terraform) example to v1.12.3 --- CHANGES.md | 4 +++ README.md | 2 +- examples/README.md | 2 +- examples/terraform/bootkube-install/README.md | 26 +++++++------------ .../terraform/bootkube-install/cluster.tf | 2 +- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 13c3967c..c234dac2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,10 @@ Notable changes between releases. ## Latest +### Examples + +* Upgrade Kubernetes example clusters to v1.12.3 (Terraform-based) + ## v0.7.1 (2018-11-01) * Add `kernel_args` variable to the terraform bootkube-install cluster definition diff --git a/README.md b/README.md index 0a96a2e2..2b2098a2 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ * [Kubernetes](Documentation/bootkube.md) - Install a 3-node Kubernetes v1.8.5 cluster * Clusters (Terraform-based) * [etcd3](examples/terraform/etcd3-install/README.md) - Install a 3-node etcd3 cluster - * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.10.3 cluster + * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.12.3 cluster ### Projects diff --git a/examples/README.md b/examples/README.md index 68b16d7c..72b0392e 100644 --- a/examples/README.md +++ b/examples/README.md @@ -10,7 +10,7 @@ These examples use [Terraform](https://www.terraform.io/intro/) as a client to M |-------------------------------|-------------------------------| | [simple-install](terraform/simple-install/) | Install Container Linux with an SSH key | | [etcd3-install](terraform/etcd3-install/) | Install a 3-node etcd3 cluster | -| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.10.3 cluster | +| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.12.3 cluster | ### Customization diff --git a/examples/terraform/bootkube-install/README.md b/examples/terraform/bootkube-install/README.md index 45def910..2d5645cb 100644 --- a/examples/terraform/bootkube-install/README.md +++ b/examples/terraform/bootkube-install/README.md @@ -1,6 +1,6 @@ # Kubernetes -The Kubernetes example shows how to use Matchbox to network boot and provision a 3 node Kubernetes v1.10.3 cluster. This example uses [Terraform](https://www.terraform.io/intro/index.html) and a module provided by [Typhoon](https://github.com/poseidon/typhoon) to describe cluster resources. [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) is run once to bootstrap the Kubernetes control plane. +The Kubernetes example shows how to use Matchbox to network boot and provision a 3 node Kubernetes v1.12.3 cluster. This example uses [Terraform](https://www.terraform.io/intro/index.html) and a module provided by [Typhoon](https://github.com/poseidon/typhoon) to describe cluster resources. [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) is run once to bootstrap the Kubernetes control plane. ## Requirements @@ -81,15 +81,6 @@ Initialize Terraform from the `bootkube-install` directory. terraform init ``` -Get or update Terraform modules. - -```sh -$ 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.11.0 (update) -``` - Plan the resources to be created. ```sh @@ -149,19 +140,20 @@ $ sudo ./scripts/libvirt [start|reboot|shutdown|poweroff|destroy] $ export KUBECONFIG=assets/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -node1.example.com Ready 11m v1.10.0 -node2.example.com Ready 11m v1.10.0 -node3.example.com Ready 11m v1.10.0 +node1.example.com Ready 11m v1.12.3 +node2.example.com Ready 11m v1.12.3 +node3.example.com Ready 11m v1.12.3 $ kubectl get pods --all-namespaces NAMESPACE NAME READY STATUS RESTARTS AGE -kube-system kube-flannel-fqp7f 2/2 Running 1 11m -kube-system kube-flannel-gnjrm 2/2 Running 0 11m -kube-system kube-flannel-llbgt 2/2 Running 0 11m +kube-system coredns-1187388186-mx9rt 3/3 Running 0 11m +kube-system coredns-1187388186-dsfk3 3/3 Running 0 11m +kube-system flannel-fqp7f 2/2 Running 1 11m +kube-system flannel-gnjrm 2/2 Running 0 11m +kube-system flannel-llbgt 2/2 Running 0 11m kube-system kube-apiserver-7336w 1/1 Running 0 11m kube-system kube-controller-manager-3271970485-b9chx 1/1 Running 0 11m kube-system kube-controller-manager-3271970485-v30js 1/1 Running 1 11m -kube-system kube-dns-1187388186-mx9rt 3/3 Running 0 11m kube-system kube-proxy-50sd4 1/1 Running 0 11m kube-system kube-proxy-bczhp 1/1 Running 0 11m kube-system kube-proxy-mp2fw 1/1 Running 0 11m diff --git a/examples/terraform/bootkube-install/cluster.tf b/examples/terraform/bootkube-install/cluster.tf index 58c715d9..b11592de 100644 --- a/examples/terraform/bootkube-install/cluster.tf +++ b/examples/terraform/bootkube-install/cluster.tf @@ -1,6 +1,6 @@ // Kubernetes cluster module "cluster" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.3" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.12.3" providers = { local = "local.default"