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

Update to Terraform 1.x #127

Merged
merged 3 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ env: &env
environment:
GRUNTWORK_INSTALLER_VERSION: v0.0.30
TERRATEST_LOG_PARSER_VERSION: v0.30.4
MODULE_CI_VERSION: v0.33.2
TERRAFORM_VERSION: 0.14.8
MODULE_CI_VERSION: v0.37.5
TERRAFORM_VERSION: 1.0.4
TERRAGRUNT_VERSION: NONE
PACKER_VERSION: NONE
GOLANG_VERSION: 1.16
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
command: |
pip install pre-commit==1.21.0 cfgv==2.0.1 zipp==1.1.0 yapf
go get golang.org/x/tools/cmd/goimports
export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH
export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH
pre-commit install
pre-commit run --all-files

Expand All @@ -69,7 +69,7 @@ jobs:
tar -xvf helm.tar.gz
chmod +x linux-amd64/helm
sudo mv linux-amd64/helm /usr/local/bin/

# Install external dependencies
- run:
name: install gcloud dependencies
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_gke)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-gke.svg?label=latest)](https://github.com/gruntwork-io/terraform-google-gke/releases/latest)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D1.0.x-blue.svg)

# Google Kubernetes Engine (GKE) Module

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 {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"

required_providers {
Expand Down Expand Up @@ -168,7 +168,7 @@ module "gke_service_account" {
# ---------------------------------------------------------------------------------------------------------------------

module "vpc_network" {
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1"
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2"

name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}"
project = var.project
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 {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"

required_providers {
Expand Down Expand Up @@ -160,7 +160,7 @@ resource "random_string" "suffix" {
}

module "vpc_network" {
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1"
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2"

name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}"
project = var.project
Expand Down
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"

required_providers {
Expand Down Expand Up @@ -208,7 +208,7 @@ resource "random_string" "suffix" {
}

module "vpc_network" {
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1"
source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2"

name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}"
project = var.project
Expand Down
4 changes: 2 additions & 2 deletions modules/gke-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

terraform {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"
}

Expand Down
4 changes: 2 additions & 2 deletions modules/gke-service-account/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"
}

Expand Down