-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from artefactory/feature/app_engine
Feature/app engine
- Loading branch information
Showing
19 changed files
with
236 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,85 +10,101 @@ locals { | |
}, var.env_variables) | ||
} | ||
|
||
data "google_project" "project" { | ||
} | ||
|
||
resource "google_service_account" "service_account_cloud_run" { | ||
account_id = format("cloud-run-%s", var.server_name) | ||
display_name = "Cloud run service account used" | ||
resource "google_app_engine_application" "app" { | ||
location_id = var.location | ||
iap { | ||
enabled = true | ||
oauth2_client_id = google_iap_client.project_client.client_id | ||
oauth2_client_secret = google_iap_client.project_client.secret | ||
} | ||
} | ||
|
||
resource "google_project_iam_member" "cloudsql" { | ||
project = google_service_account.service_account_cloud_run.project | ||
project = data.google_project.project.project_id | ||
role = "roles/cloudsql.client" | ||
member = format("serviceAccount:%s", google_service_account.service_account_cloud_run.email) | ||
member = format("serviceAccount:%s@appspot.gserviceaccount.com", data.google_project.project.name) | ||
} | ||
|
||
resource "google_project_iam_member" "secret" { | ||
project = google_service_account.service_account_cloud_run.project | ||
project = data.google_project.project.project_id | ||
role = "roles/secretmanager.secretAccessor" | ||
member = format("serviceAccount:%s", google_service_account.service_account_cloud_run.email) | ||
member = format("serviceAccount:%s@appspot.gserviceaccount.com", data.google_project.project.name) | ||
} | ||
|
||
resource "google_project_iam_member" "gcs" { | ||
project = google_service_account.service_account_cloud_run.project | ||
project = data.google_project.project.project_id | ||
role = "roles/storage.objectAdmin" | ||
member = format("serviceAccount:%s", google_service_account.service_account_cloud_run.email) | ||
member = format("serviceAccount:service-%[email protected]", data.google_project.project.number) | ||
} | ||
|
||
resource "google_project_iam_member" "gae_api" { | ||
project = data.google_project.project.project_id | ||
role = "roles/compute.networkUser" | ||
member = format("serviceAccount:%[email protected]", data.google_project.project.name) | ||
} | ||
|
||
resource "google_cloud_run_service" "default" { | ||
name = var.server_name | ||
location = var.location | ||
resource "google_app_engine_flexible_app_version" "myapp_v1" { | ||
service = var.service | ||
version_id = "v1" | ||
runtime = "custom" | ||
|
||
template { | ||
spec { | ||
service_account_name = google_service_account.service_account_cloud_run.email | ||
containers { | ||
image = var.docker_image_name | ||
dynamic "env" { | ||
for_each = local.env_variables | ||
content { | ||
name = env.key | ||
value = env.value | ||
} | ||
} | ||
resources { | ||
limits = { | ||
cpu = var.cpu_limit | ||
memory = var.memory_limit | ||
} | ||
} | ||
} | ||
} | ||
metadata { | ||
annotations = { | ||
"run.googleapis.com/cloudsql-instances" = var.sql_instance_name | ||
"run.googleapis.com/vpc-access-connector" = var.vpc_connector | ||
} | ||
deployment { | ||
container { | ||
image = var.docker_image_name | ||
} | ||
} | ||
|
||
traffic { | ||
percent = 100 | ||
latest_revision = true | ||
liveness_check { | ||
path = "/" | ||
} | ||
|
||
readiness_check { | ||
path = "/" | ||
} | ||
autogenerate_revision_name = true | ||
depends_on = [google_project_iam_member.cloudsql, google_project_iam_member.secret, google_project_iam_member.gcs, var.module_depends_on] | ||
} | ||
|
||
env_variables = local.env_variables | ||
|
||
data "google_iam_policy" "noauth" { | ||
binding { | ||
role = "roles/run.invoker" | ||
members = [ | ||
"allUsers", | ||
] | ||
automatic_scaling { | ||
cool_down_period = "120s" | ||
max_total_instances = 1 | ||
min_total_instances = 1 | ||
cpu_utilization { | ||
target_utilization = 0.5 | ||
} | ||
} | ||
resources { | ||
cpu = 1 | ||
memory_gb = 2 | ||
} | ||
network { | ||
name = var.network_short_name | ||
} | ||
} | ||
|
||
resource "google_cloud_run_service_iam_policy" "noauth" { | ||
location = google_cloud_run_service.default.location | ||
project = google_cloud_run_service.default.project | ||
service = google_cloud_run_service.default.name | ||
beta_settings = { | ||
cloud_sql_instances = format("%s=tcp:3306", var.db_instance) | ||
} | ||
|
||
policy_data = data.google_iam_policy.noauth.policy_data | ||
noop_on_destroy = true | ||
depends_on = [google_project_iam_member.gcs, google_project_iam_member.cloudsql, google_project_iam_member.secret, google_project_iam_member.gae_api] | ||
} | ||
|
||
resource "google_iap_brand" "project_brand" { | ||
support_email = var.consent_screen_support_email | ||
application_title = "mlflow" | ||
project = data.google_project.project.number | ||
} | ||
resource "google_iap_client" "project_client" { | ||
display_name = "mlflow" | ||
brand = google_iap_brand.project_brand.name | ||
} | ||
resource "google_iap_app_engine_service_iam_binding" "member" { | ||
project = data.google_project.project.name | ||
app_id = data.google_project.project.name | ||
service = google_app_engine_flexible_app_version.myapp_v1.service | ||
role = "roles/iap.httpsResourceAccessor" | ||
members = var.web_app_users | ||
depends_on = [google_app_engine_flexible_app_version.myapp_v1] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ variable "server_name" { | |
variable "location" { | ||
type = string | ||
description = "Location to deploy your server" | ||
default = "europe-west1" | ||
default = "europe-west" | ||
} | ||
variable "docker_image_name" { | ||
type = string | ||
|
@@ -15,10 +15,6 @@ variable "env_variables" { | |
type = map | ||
description = "Env variable to be used in your container" | ||
} | ||
variable "sql_instance_name" { | ||
type = string | ||
description = "Sql instance name your server needs access to" | ||
} | ||
variable "project_id" { | ||
description = "GCP project" | ||
type = string | ||
|
@@ -35,34 +31,31 @@ variable "db_name" { | |
description = "Name of the database" | ||
type = string | ||
} | ||
variable "gcs_backend" { | ||
description = "Gcs bucket used for artifacts" | ||
variable "db_instance" { | ||
description = "Name of the database instance" | ||
type = string | ||
} | ||
variable "cpu_limit" { | ||
type = string | ||
description = "Maximum cpu" | ||
default = "1000m" | ||
} | ||
variable "memory_limit" { | ||
type = string | ||
description = "Memory limit of your container" | ||
default = "1024Mi" | ||
} | ||
variable "vpc_connector" { | ||
variable "gcs_backend" { | ||
description = "Gcs bucket used for artifacts" | ||
type = string | ||
description = "Vpc connector of your private network" | ||
} | ||
variable "db_private_ip" { | ||
type = string | ||
description = "Private ip of the db" | ||
} | ||
variable "module_depends_on" { | ||
type = any | ||
default = null | ||
type = any | ||
default = null | ||
} | ||
variable "service_account_mlflow_users" { | ||
variable "consent_screen_support_email" { | ||
type = string | ||
default = "mlflow-users" | ||
description = "Service account created to connect to mlflow" | ||
} | ||
description = "Person or group to contact in case of problem" | ||
} | ||
variable "web_app_users" { | ||
type = list(string) | ||
description = "List of people who can acess the mlflow web app. e.g. [user:[email protected], group:[email protected]]" | ||
} | ||
variable "service" { | ||
default = "default" | ||
} | ||
variable "network_short_name" {} |
Oops, something went wrong.