Skip to content

Commit cefa31c

Browse files
committed
Update Kubernetes cluster example to v1.14.1
* Set terraform-provider-matchbox version to v0.2.3 * Set terraform-provider-ct version to v0.3.1
1 parent f4623c5 commit cefa31c

6 files changed

Lines changed: 19 additions & 16 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Notable changes between releases.
1414

1515
### Examples
1616

17-
* Update Kubernetes example clusters to v1.13.2 (Terraform-based)
17+
* Update Kubernetes example clusters to v1.14.1 (Terraform-based)
1818

1919
## v0.7.1 (2018-11-01)
2020

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* [Kubernetes](Documentation/bootkube.md) - Install a 3-node Kubernetes v1.8.5 cluster
3333
* Clusters (Terraform-based)
3434
* [etcd3](examples/terraform/etcd3-install/README.md) - Install a 3-node etcd3 cluster
35-
* [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.13.2 cluster
35+
* [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.14.1 cluster
3636

3737
## Contrib
3838

examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ These examples use [Terraform](https://www.terraform.io/intro/) as a client to M
1010
|-------------------------------|-------------------------------|
1111
| [simple-install](terraform/simple-install/) | Install Container Linux with an SSH key |
1212
| [etcd3-install](terraform/etcd3-install/) | Install a 3-node etcd3 cluster |
13-
| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.13.2 cluster |
13+
| [bootkube-install](terraform/bootkube-install/) | Install a 3-node Kubernetes v1.14.1 cluster |
1414

1515
### Customization
1616

examples/terraform/bootkube-install/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kubernetes
22

3-
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.
3+
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.
44

55
## Requirements
66

@@ -56,15 +56,15 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer
5656

5757
```
5858
provider "matchbox" {
59-
version = "0.2.2"
59+
version = "0.2.3"
6060
endpoint = "matchbox.example.com:8081"
6161
client_cert = "${file("~/.matchbox/client.crt")}"
6262
client_key = "${file("~/.matchbox/client.key")}"
6363
ca = "${file("~/.matchbox/ca.crt")}"
6464
}
6565
6666
provider "ct" {
67-
version = "0.3.0"
67+
version = "0.3.1"
6868
}
6969
...
7070
```
@@ -141,9 +141,9 @@ $ sudo ./scripts/libvirt [start|reboot|shutdown|poweroff|destroy]
141141
$ export KUBECONFIG=assets/auth/kubeconfig
142142
$ kubectl get nodes
143143
NAME STATUS AGE VERSION
144-
node1.example.com Ready 11m v1.13.2
145-
node2.example.com Ready 11m v1.13.2
146-
node3.example.com Ready 11m v1.13.2
144+
node1.example.com Ready 11m v1.14.1
145+
node2.example.com Ready 11m v1.14.1
146+
node3.example.com Ready 11m v1.14.1
147147

148148
$ kubectl get pods --all-namespaces
149149
NAMESPACE NAME READY STATUS RESTARTS AGE

examples/terraform/bootkube-install/cluster.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Kubernetes cluster
22
module "cluster" {
3-
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.13.2"
3+
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.14.1"
44

55
providers = {
66
local = "local.default"
@@ -15,6 +15,9 @@ module "cluster" {
1515
os_channel = "coreos-stable"
1616
os_version = "1967.3.0"
1717

18+
# default iPXE firmware (used in dnsmasq image) doesn't offer https
19+
download_protocol = "http"
20+
1821
# configuration
1922
k8s_domain_name = "cluster.example.com"
2023
ssh_authorized_key = "${var.ssh_authorized_key}"
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
// Configure the matchbox provider
22
provider "matchbox" {
3-
version = "0.2.2"
3+
version = "0.2.3"
44
endpoint = "${var.matchbox_rpc_endpoint}"
55
client_cert = "${file("~/.matchbox/client.crt")}"
66
client_key = "${file("~/.matchbox/client.key")}"
77
ca = "${file("~/.matchbox/ca.crt")}"
88
}
99

1010
provider "ct" {
11-
version = "0.3.0"
11+
version = "0.3.1"
1212
}
1313

1414
provider "local" {
1515
version = "~> 1.0"
16-
alias = "default"
16+
alias = "default"
1717
}
1818

1919
provider "null" {
2020
version = "~> 1.0"
21-
alias = "default"
21+
alias = "default"
2222
}
2323

2424
provider "template" {
2525
version = "~> 1.0"
26-
alias = "default"
26+
alias = "default"
2727
}
2828

2929
provider "tls" {
3030
version = "~> 1.0"
31-
alias = "default"
31+
alias = "default"
3232
}

0 commit comments

Comments
 (0)