Skip to content

Commit

Permalink
Add support for v2.6, v2.7 of Google providers
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-lane committed May 27, 2019
1 parent 6a20c41 commit 45c784d
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Extending the adopted spec, each change should have a link to its corresponding

## [Unreleased]

### Added

* Support for v2.6 and v2.7 of the Google providers. [#152]

### Fixed

* The dependency on jq has been documented in the README. [#151]
Expand Down Expand Up @@ -115,6 +119,7 @@ Extending the adopted spec, each change should have a link to its corresponding
[v0.3.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.2.0...v0.3.0
[v0.2.0]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v0.1.0...v0.2.0

[#152]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/152
[#151]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/151
[#148]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/148
[#132]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/132
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,11 @@ Before this module can be used on a project, you must ensure that the following
The [project factory](https://github.com/terraform-google-modules/terraform-google-project-factory) can be used to provision projects with the correct APIs active and the necessary Shared VPC connections.

### Software Dependencies
#### CLI tools
#### Kubectl
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
- [jq](https://stedolan.github.io/jq/) 1.6.x

#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.7

### Configure a Service Account
In order to execute this module you must have a Service Account with the
Expand Down
4 changes: 2 additions & 2 deletions autogen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
{% if private_cluster %}
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.7
{% else %}
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) v2.3, v2.6, v2.7
{% endif %}

### Configure a Service Account
Expand Down
4 changes: 2 additions & 2 deletions examples/deploy_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/disable_client_cert/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
credentials = "${file(var.credentials_path)}"
region = "${var.region}"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/node_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/shared_vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/simple_regional/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/simple_regional_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/simple_zonal/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/simple_zonal_private/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
4 changes: 2 additions & 2 deletions examples/stub_domains/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ locals {
}

provider "google" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

provider "google-beta" {
version = "~> 2.3.0"
version = "~> 2.7.0"
region = "${var.region}"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
#### Terraform and Plugins
- [Terraform](https://www.terraform.io/downloads.html) 0.11.x
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3
- [terraform-provider-google-beta](https://github.com/terraform-providers/terraform-provider-google-beta) v2.3, v2.6, v2.7

### Configure a Service Account
In order to execute this module you must have a Service Account with the
Expand Down

0 comments on commit 45c784d

Please sign in to comment.