diff --git a/CHANGES.md b/CHANGES.md index 32ffcf31..7fb373a7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,10 @@ Notable changes between versions. * Update etcd from v3.3.11 to [v3.3.12](https://github.com/etcd-io/etcd/releases/tag/v3.3.12) * Update Calico from v3.5.0 to v3.5.1 +#### Bare-Metal + +* Recommend updating [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin from v0.2.2 to [v0.2.3](https://github.com/coreos/terraform-provider-matchbox/releases/tag/v0.2.3) ([#402](https://github.com/poseidon/typhoon/pull/402)) + #### Addons * Raise nginx-ingress liveness/readiness timeout to 5 seconds diff --git a/docs/atomic/bare-metal.md b/docs/atomic/bare-metal.md index dffd5bb6..df9bbb09 100644 --- a/docs/atomic/bare-metal.md +++ b/docs/atomic/bare-metal.md @@ -174,20 +174,12 @@ $ terraform version Terraform v0.11.7 ``` -Add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system. +Add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. ```sh -wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.2/terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -tar xzf terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -sudo mv terraform-provider-matchbox-v0.2.2-linux-amd64/terraform-provider-matchbox /usr/local/bin/ -``` - -Add the plugin to your `~/.terraformrc`. - -``` -providers { - matchbox = "/usr/local/bin/terraform-provider-matchbox" -} +wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.3/terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +tar xzf terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +mv terraform-provider-matchbox-v0.2.3-linux-amd64/terraform-provider-matchbox ~/.terraform.d/plugins/terraform-provider-matchbox_v0.2.3 ``` Read [concepts](/architecture/concepts/) to learn about Terraform, modules, and organizing resources. Change to your infrastructure repository (e.g. `infra`). @@ -202,6 +194,7 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer ```tf provider "matchbox" { + version = "0.2.3" endpoint = "matchbox.example.com:8081" client_cert = "${file("~/.config/matchbox/client.crt")}" client_key = "${file("~/.config/matchbox/client.key")}" diff --git a/docs/cl/bare-metal.md b/docs/cl/bare-metal.md index 43db3f2f..af1b518e 100644 --- a/docs/cl/bare-metal.md +++ b/docs/cl/bare-metal.md @@ -116,9 +116,9 @@ Terraform v0.11.7 Add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. ```sh -wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.2/terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -tar xzf terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -mv terraform-provider-matchbox-v0.2.2-linux-amd64/terraform-provider-matchbox ~/.terraform.d/plugins/terraform-provider-matchbox_v0.2.2 +wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.3/terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +tar xzf terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +mv terraform-provider-matchbox-v0.2.3-linux-amd64/terraform-provider-matchbox ~/.terraform.d/plugins/terraform-provider-matchbox_v0.2.3 ``` Add the [terraform-provider-ct](https://github.com/coreos/terraform-provider-ct) plugin binary for your system to `~/.terraform.d/plugins/`, noting the final name. @@ -141,7 +141,7 @@ Configure the Matchbox provider to use your Matchbox API endpoint and client cer ```tf provider "matchbox" { - version = "0.2.2" + version = "0.2.3" endpoint = "matchbox.example.com:8081" client_cert = "${file("~/.config/matchbox/client.crt")}" client_key = "${file("~/.config/matchbox/client.key")}" diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 94d52935..0675ea47 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -156,9 +156,9 @@ mv terraform-provider-ct-v0.2.1-linux-amd64/terraform-provider-ct ~/.terraform.d If you use bare-metal, add the [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin binary for your system to `~/.terraform.d/plugins/`, noting the versioned name. ```sh -wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.2/terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -tar xzf terraform-provider-matchbox-v0.2.2-linux-amd64.tar.gz -mv terraform-provider-matchbox-v0.2.2-linux-amd64/terraform-provider-matchbox ~/.terraform.d/plugins/terraform-provider-matchbox_v0.2.2 +wget https://github.com/coreos/terraform-provider-matchbox/releases/download/v0.2.3/terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +tar xzf terraform-provider-matchbox-v0.2.3-linux-amd64.tar.gz +mv terraform-provider-matchbox-v0.2.3-linux-amd64/terraform-provider-matchbox ~/.terraform.d/plugins/terraform-provider-matchbox_v0.2.3 ``` Binary names are versioned. This enables the ability to upgrade different plugins and have clusters pin different versions. @@ -168,7 +168,7 @@ $ tree ~/.terraform.d/ /home/user/.terraform.d/ └── plugins ├── terraform-provider-ct_v0.2.1 - └── terraform-provider-matchbox_v0.2.2 + └── terraform-provider-matchbox_v0.2.3 ``` In each Terraform working directory, set the version of each provider. @@ -177,7 +177,7 @@ In each Terraform working directory, set the version of each provider. # providers.tf provider "matchbox" { - version = "0.2.2" + version = "0.2.3" ... } @@ -215,7 +215,7 @@ $ tree ~/.terraform.d/ └── plugins ├── terraform-provider-ct_v0.2.1 ├── terraform-provider-ct_v0.3.0 - └── terraform-provider-matchbox_v0.2.2 + └── terraform-provider-matchbox_v0.2.3 ```