Skip to content

Commit

Permalink
add WIP version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jarpat committed Nov 16, 2023
1 parent 50aa448 commit ff61278
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
8 changes: 4 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data "google_container_engine_versions" "gke-version" {

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
version = "25.0.0"
version = "29.0.0"
project_id = var.project
name = "${var.prefix}-gke"
region = local.region
Expand Down Expand Up @@ -233,10 +233,10 @@ resource "local_file" "kubeconfig" {
directory_permission = "0755"
}

# Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/12.0.0/submodules/postgresql
# Module Registry - https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/17.0.1/submodules/postgresql
module "postgresql" {
source = "GoogleCloudPlatform/sql-db/google//modules/postgresql"
version = "15.0.0"
version = "17.0.1"
project_id = var.project

for_each = local.postgres_servers != null ? length(local.postgres_servers) != 0 ? local.postgres_servers : {} : {}
Expand Down Expand Up @@ -288,7 +288,7 @@ module "postgresql" {

module "sql_proxy_sa" {
source = "terraform-google-modules/service-accounts/google"
version = "4.2.1"
version = "4.2.2"
count = var.postgres_servers != null ? length(var.postgres_servers) != 0 ? 1 : 0 : 0
project_id = var.project
prefix = var.prefix
Expand Down
3 changes: 2 additions & 1 deletion modules/google_vm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

module "address" {
source = "terraform-google-modules/address/google"
version = "3.1.2"
version = "3.1.3"
project_id = var.project
region = var.region
address_type = "EXTERNAL"
names = var.create_public_ip ? ["${var.name}-address"] : []
# TODO UPDATE DEFAULTS and wait for TPG 5.0.0 support
}

resource "google_compute_instance" "google_vm" {
Expand Down
6 changes: 4 additions & 2 deletions network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data "google_compute_address" "nat_address" {
module "nat_address" {
count = length(var.nat_address_name) == 0 ? 1 : 0
source = "terraform-google-modules/address/google"
version = "3.1.2"
version = "3.1.3"
project_id = var.project
region = local.region
address_type = "EXTERNAL"
Expand All @@ -23,14 +23,16 @@ module "nat_address" {
module "cloud_nat" {
count = length(var.nat_address_name) == 0 ? 1 : 0
source = "terraform-google-modules/cloud-nat/google"
version = "3.0.0"
version = "5.0.0"
project_id = var.project
name = "${var.prefix}-cloud-nat"
region = local.region
create_router = true
router = "${var.prefix}-router"
network = module.vpc.network_self_link
nat_ips = module.nat_address[0].self_links
# TODO CHANGE DEFAULT? see https://github.com/terraform-google-modules/terraform-google-cloud-nat/releases/tag/v5.0.0
# TODO UPDATE DEFAULTS and wait for TPG 5.0.0 support
}

module "vpc" {
Expand Down
6 changes: 3 additions & 3 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "4.63.1"
version = "5.5.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "4.63.1"
version = "5.5.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0" # Constrained by Google
version = "2.23.0" # Constrained by Google
}
local = {
source = "hashicorp/local"
Expand Down

0 comments on commit ff61278

Please sign in to comment.