Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin versions of modules and providers #237

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Pin versions of modules and providers #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 27 additions & 27 deletions deployment/live/serving/ci/.terraform.lock.hcl
View file
Open in desktop

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

54 changes: 27 additions & 27 deletions deployment/live/serving/dev/.terraform.lock.hcl
View file
Open in desktop

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

56 changes: 28 additions & 28 deletions deployment/live/serving/prod/.terraform.lock.hcl
View file
Open in desktop

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

22 changes: 14 additions & 8 deletions deployment/modules/distributor/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ terraform {
backend "gcs" {}
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "5.14.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "5.14.0"
}
}
Expand Down Expand Up @@ -108,6 +112,7 @@ module "network-safer-mysql-simple" {

module "private-service-access" {
source = "GoogleCloudPlatform/sql-db/google//modules/private_service_access"
version = "20.0.0"
project_id = var.project_id
vpc_network = module.network-safer-mysql-simple.network_name
}
Expand All @@ -119,6 +124,7 @@ locals {

module "safer-mysql-db" {
source = "GoogleCloudPlatform/sql-db/google//modules/safer_mysql"
version = "20.0.0"
name = "distributor-mysql-${var.env}-instance-1"
random_instance_name = true
project_id = var.project_id
Expand Down Expand Up @@ -191,7 +197,7 @@ resource "google_cloud_run_v2_service" "default" {
containers {
image = var.distributor_docker_image
name = "distributor"
args = concat([
args = concat([
"--logtostderr",
"--v=1",
"--use_cloud_sql",
Expand Down Expand Up @@ -225,9 +231,9 @@ resource "google_cloud_run_v2_service" "default" {

startup_probe {
initial_delay_seconds = 1
timeout_seconds = 1
period_seconds = 10
failure_threshold = 3
timeout_seconds = 1
period_seconds = 10
failure_threshold = 3
tcp_socket {
port = 8080
}
Expand All @@ -239,8 +245,8 @@ resource "google_cloud_run_v2_service" "default" {
}
}
containers {
image = "us-docker.pkg.dev/cloud-ops-agents-artifacts/cloud-run-gmp-sidecar/cloud-run-gmp-sidecar:1.0.0"
name = "collector"
image = "us-docker.pkg.dev/cloud-ops-agents-artifacts/cloud-run-gmp-sidecar/cloud-run-gmp-sidecar:1.0.0"
name = "collector"
depends_on = ["distributor"]
}
volumes {
Expand All @@ -250,7 +256,7 @@ resource "google_cloud_run_v2_service" "default" {
}
}
}
client = "terraform"
client = "terraform"
depends_on = [
google_project_service.secretmanager_api,
google_project_service.cloudrun_api,
Expand Down
Loading