Update Kubernetes (terraform) example to v1.10.3

* https://github.com/poseidon/typhoon/releases/tag/v1.10.3
poseidon · May 30, 2018 · be057ed · be057ed
1 parent 8bb9914
commit be057ed
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git 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.0 cluster
+  * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.10.3 cluster
 
 ### Projects
 

diff --git 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.0 cluster |
+| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.10.3 cluster |
 
 ### Customization
 

diff --git 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.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.
+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.
 
 ## Requirements
 
@@ -35,8 +35,8 @@ matchbox_rpc_endpoint = "matchbox.example.com:8081"
 ssh_authorized_key = "ADD ME"
 
 cluster_name = "demo"
-container_linux_version = "1576.5.0"
-container_linux_channel = "stable"
+os_channel   = "coreos-stable"
+os_version   = "1576.5.0"
 ```
 
 Provide an ordered list of controller names, MAC addresses, and domain names. Provide an ordered list of worker names, MAC addresses, and domain names.

diff --git 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.0"
+  source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.3"
 
   providers = {
     local = "local.default"
@@ -12,8 +12,8 @@ module "cluster" {
   # 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}"
+  os_channel              = "${var.os_channel}"
+  os_version              = "${var.os_version}"
 
   # configuration
   k8s_domain_name    = "${var.k8s_domain_name}"

diff --git a/examples/terraform/bootkube-install/multi-controller.tfvars.example b/examples/terraform/bootkube-install/multi-controller.tfvars.example
@@ -3,8 +3,8 @@ matchbox_rpc_endpoint = "matchbox.example.com:8081"
 # ssh_authorized_key = "ADD ME"
 
 cluster_name = "example"
-container_linux_version = "1576.5.0"
-container_linux_channel = "stable"
+os_channel   = "coreos-stable"
+os_version   = "1576.5.0"
 
 # Machines
 controller_names = ["node1", "node2", "node3"]

diff --git a/examples/terraform/bootkube-install/terraform.tfvars.example b/examples/terraform/bootkube-install/terraform.tfvars.example
@@ -3,8 +3,8 @@ matchbox_rpc_endpoint = "matchbox.example.com:8081"
 # ssh_authorized_key = "ADD ME"
 
 cluster_name = "example"
-container_linux_version = "1576.5.0"
-container_linux_channel = "stable"
+os_channel = "coreos-stable"
+os_version = "1576.5.0"
 
 # Machines
 controller_names = ["node1"]

diff --git a/examples/terraform/bootkube-install/variables.tf b/examples/terraform/bootkube-install/variables.tf
@@ -8,14 +8,14 @@ variable "matchbox_rpc_endpoint" {
   description = "Matchbox gRPC API endpoint, without the protocol (e.g. matchbox.example.com:8081)"
 }
 
-variable "container_linux_channel" {
+variable "os_channel" {
   type        = "string"
-  description = "Container Linux channel corresponding to the container_linux_version"
+  description = "Channel for a Container Linux derivative"
 }
 
-variable "container_linux_version" {
+variable "os_version" {
   type        = "string"
-  description = "Container Linux version of the kernel/initrd to PXE or the image to install"
+  description = "Version for a Container Linux to PXE and install"
 }
 
 variable "cluster_name" {
@@ -94,7 +94,7 @@ EOD
 variable "cached_install" {
   type        = "string"
   default     = "false"
-  description = "Whether Container Linux should PXE boot and install from matchbox /assets cache. Note that the admin must have downloaded the container_linux_version into matchbox assets."
+  description = "Whether Container Linux should PXE boot and install from matchbox /assets cache. Note that the admin must have downloaded the os_version into matchbox assets."
 }
 
 variable "install_disk" {