diff --git a/CHANGES.md b/CHANGES.md index ad3272e7..f96e5a8c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,7 +14,7 @@ Notable changes between releases. ### Examples -* Update Kubernetes example clusters to v1.13.2 (Terraform-based) +* Update Kubernetes example clusters to v1.14.1 (Terraform-based) ## v0.7.1 (2018-11-01) diff --git a/README.md b/README.md index 636fd0ac..d5467169 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,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.13.2 cluster + * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.14.1 cluster ## Contrib diff --git a/examples/README.md b/examples/README.md index ca3155d8..443ad2f1 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.13.2 cluster | +| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.14.1 cluster | ### Customization diff --git a/examples/terraform/bootkube-install/README.md b/examples/terraform/bootkube-install/README.md index 9f8206dd..e451b070 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.13.2 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.14.1 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 @@ -56,7 +56,7 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer ``` provider "matchbox" { - version = "0.2.2" + version = "0.2.3" endpoint = "matchbox.example.com:8081" client_cert = "${file("~/.matchbox/client.crt")}" client_key = "${file("~/.matchbox/client.key")}" @@ -64,7 +64,7 @@ provider "matchbox" { } provider "ct" { - version = "0.3.0" + version = "0.3.1" } ... ``` @@ -141,9 +141,9 @@ $ 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.13.2 -node2.example.com Ready 11m v1.13.2 -node3.example.com Ready 11m v1.13.2 +node1.example.com Ready 11m v1.14.1 +node2.example.com Ready 11m v1.14.1 +node3.example.com Ready 11m v1.14.1 $ kubectl get pods --all-namespaces NAMESPACE NAME READY STATUS RESTARTS AGE diff --git a/examples/terraform/bootkube-install/cluster.tf b/examples/terraform/bootkube-install/cluster.tf index 99d25562..c0208479 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.13.2" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.14.1" providers = { local = "local.default" @@ -15,6 +15,9 @@ module "cluster" { os_channel = "coreos-stable" os_version = "1967.3.0" + # default iPXE firmware (used in dnsmasq image) doesn't offer https + download_protocol = "http" + # configuration k8s_domain_name = "cluster.example.com" ssh_authorized_key = "${var.ssh_authorized_key}" diff --git a/examples/terraform/bootkube-install/provider.tf b/examples/terraform/bootkube-install/provider.tf index 748a1a3c..4464f926 100644 --- a/examples/terraform/bootkube-install/provider.tf +++ b/examples/terraform/bootkube-install/provider.tf @@ -1,6 +1,6 @@ // Configure the matchbox provider provider "matchbox" { - version = "0.2.2" + version = "0.2.3" endpoint = "${var.matchbox_rpc_endpoint}" client_cert = "${file("~/.matchbox/client.crt")}" client_key = "${file("~/.matchbox/client.key")}" @@ -8,25 +8,25 @@ provider "matchbox" { } provider "ct" { - version = "0.3.0" + version = "0.3.1" } provider "local" { version = "~> 1.0" - alias = "default" + alias = "default" } provider "null" { version = "~> 1.0" - alias = "default" + alias = "default" } provider "template" { version = "~> 1.0" - alias = "default" + alias = "default" } provider "tls" { version = "~> 1.0" - alias = "default" + alias = "default" }