Skip to content
This repository has been archived by the owner on Mar 29, 2023. It is now read-only.

Commit

Permalink
Merge pull request #58 from gruntwork-io/update-terraform-dependency
Browse files Browse the repository at this point in the history
Depend on Terraform 0.12.7
  • Loading branch information
robmorgan authored Sep 6, 2019
2 parents 47e81dd + ed5cc53 commit 37dbb08
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaults: &defaults
KUBERGRUNT_VERSION: v0.3.9
HELM_VERSION: v2.11.0
MODULE_CI_VERSION: v0.13.3
TERRAFORM_VERSION: 0.12.6
TERRAFORM_VERSION: 0.12.7
TERRAGRUNT_VERSION: NONE
PACKER_VERSION: NONE
GOLANG_VERSION: 1.11.2
Expand Down
6 changes: 3 additions & 3 deletions examples/gke-basic-tiller/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
# The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
# compatible with any versions below 0.12.
required_version = ">= 0.12"
# The modules used in this example have been updated with 0.12 syntax, additionally we depend on a bug fixed in
# version 0.12.7.
required_version = ">= 0.12.7"
}

# ---------------------------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions examples/gke-private-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
# The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
# compatible with any versions below 0.12.
required_version = ">= 0.12"
# The modules used in this example have been updated with 0.12 syntax, additionally we depend on a bug fixed in
# version 0.12.7.
required_version = ">= 0.12.7"
}

# ---------------------------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions examples/gke-public-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
# The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
# compatible with any versions below 0.12.
required_version = ">= 0.12"
# The modules used in this example have been updated with 0.12 syntax, additionally we depend on a bug fixed in
# version 0.12.7.
required_version = ">= 0.12.7"
}

# ---------------------------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
# The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
# compatible with any versions below 0.12.
required_version = ">= 0.12"
# The modules used in this example have been updated with 0.12 syntax, additionally we depend on a bug fixed in
# version 0.12.7.
required_version = ">= 0.12.7"
}

# ---------------------------------------------------------------------------------------------------------------------
Expand Down
9 changes: 9 additions & 0 deletions modules/gke-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
# This module deploys a GKE cluster, a managed, production-ready environment for deploying containerized applications.
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

# ----------------------------------------------------------------------------------------------------------------------
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
# This module uses terraform 0.12 syntax and features that are available only since version 0.12.6, however
# we now depend on a bug fix released in 0.12.7.
# ----------------------------------------------------------------------------------------------------------------------
terraform {
required_version = ">= 0.12.7"
}

# ---------------------------------------------------------------------------------------------------------------------
# Create the GKE Cluster
# We want to make a cluster with no node pools, and manage them all with the fine-grained google_container_node_pool resource
Expand Down
6 changes: 3 additions & 3 deletions modules/gke-service-account/main.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# ----------------------------------------------------------------------------------------------------------------------
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
# This module uses terraform 0.12 syntax and features that are available only
# since version 0.12.6
# This module uses terraform 0.12 syntax and features that are available only since version 0.12.6, however
# we now depend on a bug fix released in 0.12.7.
# ----------------------------------------------------------------------------------------------------------------------
terraform {
required_version = ">= 0.12.6"
required_version = ">= 0.12.7"
}

# ----------------------------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit 37dbb08

Please sign in to comment.