kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fast-dev

Browse Source
This commit is contained in:
Ludo
2024-11-04 10:45:44 +01:00
parent 035fcd6cc5 4ab9c74e9f
commit 7688072b0c
7 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
blueprints/apigee/bigquery-analytics/main.tf
View File

@@ -143,7 +143,6 @@ module "bucket_export" {
]
}
notification_config = {
create_topic = {}
enabled = true
payload_format = "JSON_API_V1"
sa_email = module.project.service_agents.storage.email

4
blueprints/data-solutions/vertex-mlops/README.md
View File

@@ -72,7 +72,7 @@ module "test" {
project_id = "test-dev"
}
}
# tftest modules=11 resources=86
# tftest modules=11 resources=90
```
<!-- BEGIN TFDOC -->
## Variables
@@ -128,5 +128,5 @@ module "test" {
project_id = "test-dev"
}
}
# tftest modules=13 resources=91 e2e
# tftest modules=13 resources=95 e2e
```

9
blueprints/data-solutions/vertex-mlops/main.tf
View File

@@ -141,10 +141,10 @@ module "vpc-local" {
name = "vertex"
subnets = [
{
"name" : "subnet-${var.region}",
"region" : "${var.region}",
"ip_cidr_range" : "10.4.0.0/24",
"secondary_ip_range" : null
name = "subnet-${var.region}",
region = var.region,
ip_cidr_range = "10.5.0.0/24"
enable_private_access = true
}
]
psa_configs = [{
@@ -264,6 +264,7 @@ module "project" {
"bigquery.googleapis.com",
"bigquerystorage.googleapis.com",
"cloudbuild.googleapis.com",
"containerfilesystem.googleapis.com",
"compute.googleapis.com",
"datacatalog.googleapis.com",
"dataflow.googleapis.com",

2
blueprints/data-solutions/vertex-mlops/outputs.tf
View File

@@ -36,7 +36,7 @@ output "notebook" {
description = "Vertex AI notebooks ids."
value = merge(
{ for k, v in resource.google_notebooks_runtime.runtime : k => v.id },
{ for k, v in resource.google_notebooks_instance.playground : k => v.id }
{ for k, v in resource.google_workbench_instance.playground : k => v.id }
)
}

88
blueprints/data-solutions/vertex-mlops/vertex.tf
View File

@@ -37,6 +37,13 @@ module "service-account-notebook" {
source = "../../../modules/iam-service-account"
project_id = module.project.project_id
name = "notebook-sa"
iam_project_roles = {
(module.project.project_id) = [
"roles/logging.logWriter",
"roles/monitoring.metricWriter",
"roles/serviceusage.serviceUsageConsumer",
]
}
}
resource "google_notebooks_runtime" "runtime" {
@@ -79,54 +86,49 @@ resource "google_notebooks_runtime" "runtime" {
}
}
resource "google_notebooks_instance" "playground" {
for_each = { for k, v in var.notebooks : k => v if v.type == "USER_MANAGED" }
name = "${var.prefix}-${each.key}"
location = "${var.region}-b"
machine_type = var.notebooks[each.key].machine_type
project = module.project.project_id
resource "google_workbench_instance" "playground" {
for_each = { for k, v in var.notebooks : k => v if v.type == "USER_MANAGED" }
project = module.project.project_id
name = "${var.prefix}-${each.key}"
location = "${var.region}-b"
container_image {
repository = "gcr.io/deeplearning-platform-release/base-cpu"
tag = "latest"
gce_setup {
machine_type = var.notebooks[each.key].machine_type
container_image {
repository = "gcr.io/deeplearning-platform-release/workbench-container"
tag = "latest"
}
boot_disk {
disk_size_gb = 150
disk_type = "PD_SSD"
disk_encryption = var.service_encryption_keys.notebooks != null ? "CMEK" : null
kms_key = var.service_encryption_keys.notebooks
}
disable_public_ip = var.notebooks[each.key].internal_ip_only
network_interfaces {
network = local.vpc
subnet = local.subnet
}
service_accounts {
email = module.service-account-notebook.email
}
# full list of supported metadata keys:
# https://cloud.google.com/vertex-ai/docs/workbench/instances/manage-metadata
metadata = {
notebook-disable-nbconvert = "false"
notebook-disable-downloads = "false"
notebook-disable-terminal = "false"
notebook-disable-root = "true"
}
tags = ["ssh"]
}
install_gpu_driver = true
boot_disk_type = "PD_SSD"
boot_disk_size_gb = 110
disk_encryption = var.service_encryption_keys.notebooks != null ? "CMEK" : null
kms_key = var.service_encryption_keys.notebooks
no_public_ip = var.notebooks[each.key].internal_ip_only
no_proxy_access = false
network = local.vpc
subnet = local.subnet
instance_owners = try(tolist(var.notebooks[each.key].owner), null)
service_account = module.service-account-notebook.email
service_account_scopes = [
"https://www.googleapis.com/auth/cloud-platform",
"https://www.googleapis.com/auth/userinfo.email",
]
disable_proxy_access = true
instance_owners = try(tolist(var.notebooks[each.key].owner), null)
metadata = {
notebook-disable-nbconvert = "false"
notebook-disable-downloads = "false"
notebook-disable-terminal = "false"
notebook-disable-root = "true"
}
# Remove once terraform-provider-google/issues/9164 is fixed
lifecycle {
ignore_changes = [disk_encryption, kms_key]
}
#TODO Uncomment once terraform-provider-google/issues/9273 is fixed
# tags = ["ssh"]
depends_on = [
google_project_iam_member.shared_vpc,
]
}