Skip to content

Commit

Permalink
fix(deps): update terraform module versions
Browse files Browse the repository at this point in the history
Change-Id: I5f79e7183a315172ffdd158eaea8870369a85727
  • Loading branch information
nielm committed Oct 31, 2024
1 parent dc01699 commit d467296
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 118 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"start-scaler-function": "functions-framework --target=scaleMemorystoreClusterHTTP --port=8081",
"terraform-fmt": "echo 'Running Terraform fmt'; find . -name '*.tf' -print0 | xargs -0 terraform fmt",
"terraform-fmt-check": "echo 'Checking Terraform format'; if ! find . -name '*.tf' -print0 | xargs -0 terraform fmt -check; then echo 'Files need reformatting: npm run terraform-fmt'; exit 1; fi",
"terraform-validate": "set -e ; package_root=\"$(pwd)\"; for x in gke/unified cloud-functions/distributed/app-project cloud-functions/distributed/autoscaler-project cloud-functions/per-project ; do cd \"$package_root/terraform/$x\" ; echo \"\n\nValidating Terraform in $PWD\" ; terraform init >/dev/null ; terraform validate; done",
"terraform-validate": "set -e ; package_root=\"$(pwd)\"; for x in gke/unified cloud-functions/distributed/app-project cloud-functions/distributed/autoscaler-project cloud-functions/per-project ; do cd \"$package_root/terraform/$x\" ; echo \"\n\nValidating Terraform in $PWD\" ; terraform init ; terraform validate; done",
"test": "NODE_ENV=test nyc --reporter=text mocha --recursive src --extension=.test.js --timeout 10000",
"test-e2e": "pushd terraform/cloud-functions/per-project/test && go test -run . -timeout 60m --tags=e2e && popd",
"typecheck": "tsc --project jsconfig.json --maxNodeModuleJsDepth 0 --noEmit",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/cloud-functions/distributed/app-project/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.1.0"
version = "6.9.0"
}
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.1.0"
version = "6.9.0"
}
}
}
Expand All @@ -28,11 +28,6 @@ provider "google" {
region = var.region
}

provider "google-beta" {
project = var.project_id
region = var.region
}

resource "google_service_account" "poller_sa" {
account_id = "poller-sa"
display_name = "Memorystore Cluster Autoscaler - Poller SA"
Expand Down
28 changes: 14 additions & 14 deletions terraform/cloud-functions/per-project/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/cloud-functions/per-project/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.1.0"
version = "6.9.0"
}
}
}
Expand Down
84 changes: 42 additions & 42 deletions terraform/gke/unified/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions terraform/gke/unified/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.1.0"
version = "6.9.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = ">= 2.32.0"
version = "2.33.0"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions terraform/modules/autoscaler-gke/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ resource "kubernetes_namespace" "autoscaler_namespace" {
module "workload_identity_poller" {
count = var.unified_components ? 0 : 1
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = ">= 33.0.3"
version = "34.0.0"
project_id = var.project_id
namespace = var.namespace
use_existing_k8s_sa = false
Expand All @@ -109,7 +109,7 @@ module "workload_identity_poller" {

module "workload_identity_scaler" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = ">= 33.0.3"
version = "34.0.0"
project_id = var.project_id
namespace = var.namespace
use_existing_k8s_sa = false
Expand All @@ -120,7 +120,7 @@ module "workload_identity_scaler" {

module "workload_identity_otel_collector" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = ">= 33.0.3"
version = "34.0.0"
project_id = var.project_id
namespace = var.namespace
use_existing_k8s_sa = false
Expand All @@ -131,7 +131,7 @@ module "workload_identity_otel_collector" {

module "autoscaler-gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
version = ">= 33.0.3"
version = "34.0.0"
project_id = var.project_id
name = var.name
region = var.region
Expand Down

0 comments on commit d467296

Please sign in to comment.