From 29c93046efc2a6d489af2c5b36d4adcf4078c205 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 27 Mar 2018 21:44:16 -0700 Subject: [PATCH] Update terraform Kubernetes examples to v1.10.0 --- CHANGES.md | 1 + README.md | 2 +- examples/README.md | 2 +- examples/terraform/bootkube-install/README.md | 10 +++---- .../terraform/bootkube-install/cluster.tf | 26 +++++++++---------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a5d3953a..468e4117 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ Notable changes between releases. ## Latest +* Upgrade Kubernetes example clusters to v1.10.0 (Terraform-based) * Upgrade Kubernetes example clusters to v1.8.5 ## v0.7.0 (2017-12-12) diff --git a/README.md b/README.md index dd4b0508..f9f4e1f6 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.8.5 cluster + * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.10.0 cluster ### Projects diff --git a/examples/README.md b/examples/README.md index cc53a260..57c6ac2a 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.8.5 cluster | +| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.10.0 cluster | ### Customization diff --git a/examples/terraform/bootkube-install/README.md b/examples/terraform/bootkube-install/README.md index 266f5b4c..880e2e61 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.9.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.10.0 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 @@ -87,7 +87,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.10.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.11.0 (update) ``` Plan the resources to be created. @@ -149,9 +149,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.9.3 -node2.example.com Ready 11m v1.9.3 -node3.example.com Ready 11m v1.9.3 +node1.example.com Ready 11m v1.10.0 +node2.example.com Ready 11m v1.10.0 +node3.example.com Ready 11m v1.10.0 $ 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 99e67045..908fe0c2 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.9.3" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.0" providers = { local = "local.default" @@ -9,15 +9,16 @@ module "cluster" { tls = "tls.default" } - # install + # bare-metal + cluster_name = "${var.cluster_name}" matchbox_http_endpoint = "${var.matchbox_http_endpoint}" container_linux_channel = "${var.container_linux_channel}" container_linux_version = "${var.container_linux_version}" - ssh_authorized_key = "${var.ssh_authorized_key}" - # cluster - cluster_name = "${var.cluster_name}" - k8s_domain_name = "${var.k8s_domain_name}" + # configuration + k8s_domain_name = "${var.k8s_domain_name}" + ssh_authorized_key = "${var.ssh_authorized_key}" + asset_dir = "${var.asset_dir}" # machines controller_names = "${var.controller_names}" @@ -27,12 +28,9 @@ module "cluster" { worker_macs = "${var.worker_macs}" worker_domains = "${var.worker_domains}" - # bootkube assets - asset_dir = "${var.asset_dir}" - - # Optional - networking = "${var.networking}" - cached_install = "${var.cached_install}" - install_disk = "${var.install_disk}" - container_linux_oem = "${var.container_linux_oem}" + # optional + networking = "${var.networking}" + cached_install = "${var.cached_install}" + install_disk = "${var.install_disk}" + container_linux_oem = "${var.container_linux_oem}" }