github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update terraform Kubernetes examples to v1.10.0

Browse Source
This commit is contained in:
Dalton Hubble
2018-03-27 21:44:16 -07:00
parent 34e981dc7c
commit 29c93046ef
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@@ -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)

2
README.md
View File

@@ -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

2
examples/README.md
View File

@@ -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

10
examples/terraform/bootkube-install/README.md
View File

@@ -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

26
examples/terraform/bootkube-install/cluster.tf
View File

@@ -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}"
}