Skip to content

Commit 31a8529

Browse files
authored
Bumping default Anthos to 1.7.0 (#68)
* Bumping default Anthos to 1.7.0 * Bumping README.md refer to 1.7 docs * Added default storage_options
1 parent 3fb5b25 commit 31a8529

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ The default variables make use of 6 [c3.small.x86](https://metal.equinix.com/pro
3939

4040
The Terraform has been successfully tested with following versions of Anthos on Baremetal:
4141

42+
- 1.7.0
4243
- 1.6.0
4344

4445
To simplify setup, this is designed to use manual LoadBalancing with [Kube-VIP](https://kube-vip.io) load balancer. No other load balancer support is planned at this time.
@@ -91,7 +92,7 @@ rm -f terraform_0.14.2_linux_amd64.zip
9192

9293
## Manage your GCP Keys for your service accounts
9394

94-
The Anthos on Baremetal install requires several service accounts and keys to be created. See the [Google documentation](https://cloud.google.com/anthos/gke/docs/bare-metal/1.6/installing/install-prereq#service_accounts_prerequisites) for more details. By default, Terraform will create and manage these service accounts and keys for you (recommended). Alternatively, you can create these keys manually, or use a provided helper script to make the keys for you.
95+
The Anthos on Baremetal install requires several service accounts and keys to be created. See the [Google documentation](https://cloud.google.com/anthos/gke/docs/bare-metal/1.7/installing/install-prereq#service_accounts_prerequisites) for more details. By default, Terraform will create and manage these service accounts and keys for you (recommended). Alternatively, you can create these keys manually, or use a provided helper script to make the keys for you.
9596

9697
If you choose to manage the keys yourself, the Terraform files expect the keys to use the following naming convention, matching that of the Google documentation:
9798

@@ -106,7 +107,7 @@ util
106107
```
107108

108109
If doing so manually, you must create each of these keys and place it in a folder named `keys` within the `util` folder.
109-
The service accounts also need to have IAM roles assigned to each of them. To do this manually, you'll need to follow the [instructions from Google](https://cloud.google.com/anthos/gke/docs/bare-metal/1.6/installing/install-prereq#service_accounts_prerequisites)
110+
The service accounts also need to have IAM roles assigned to each of them. To do this manually, you'll need to follow the [instructions from Google](https://cloud.google.com/anthos/gke/docs/bare-metal/1.7/installing/install-prereq#service_accounts_prerequisites)
110111

111112
Much easier (and recommended) is to use the helper script located in the `util` directory called `setup_gcp_project.sh` to create these keys and assign the IAM roles. The script will allow you to log into GCP with your user account and the GCP project for your Anthos cluster.
112113

@@ -182,7 +183,7 @@ A complete list of variables can be found at <https://registry.terraform.io/modu
182183
| bgp_asn | string | 65000 | BGP ASN to peer with Equinix Metal |
183184
| ccm_version | string | v2.0.0 | The version of the Equinix Metal CCM |
184185
| kube_vip_version | string | 0.2.3 | The version of Kube-VIP to install |
185-
| anthos_version | string | 1.6.0 | The version of Google Anthos to install |
186+
| anthos_version | string | 1.7.0 | The version of Google Anthos to install |
186187
| ccm_deploy_url | string | **Too Long to put here...** | The deploy url for the Equinix Metal CCM |
187188
| kube_vip_daemonset_url | string | **Too Long to put here...** | The deploy url for the Kube-VIP Daemonset |
188189
| storage_provider | string | n/a | Enable a Storage module (examples: "portworx", "rook") |

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ variable "kube_vip_version" {
118118

119119
variable "anthos_version" {
120120
type = string
121-
default = "1.6.0"
121+
default = "1.7.0"
122122
description = "The version of Google Anthos to install"
123123
}
124124

@@ -143,5 +143,5 @@ variable "storage_module" {
143143
variable "storage_options" {
144144
type = any
145145
description = "Options specific to the storage module. Check the documentation for the storage module for details."
146-
default = null
146+
default = {}
147147
}

0 commit comments

Comments
 (0)