zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kthhrv-patch-1

This commit is contained in:
Keith Harvey 2023-06-29 10:10:14 +01:00 committed by GitHub
parent 912497a158 026071209c
commit b203198441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/data-solutions/data-platform-minimal/02-dataproc.tf
View File

@ -84,7 +84,7 @@ module "processing-dp-historyserver" {
staging_bucket = module.processing-staging-0.name staging_bucket = module.processing-staging-0.name
temp_bucket = module.processing-temp-0.name temp_bucket = module.processing-temp-0.name
gce_cluster_config = { gce_cluster_config = {
subnetwork = module.processing-vpc[0].subnets["${var.region}/${var.prefix}-processing"].self_link subnetwork = local.processing_subnet
zone = "${var.region}-b" zone = "${var.region}-b"
service_account = module.processing-sa-0.email service_account = module.processing-sa-0.email
service_account_scopes = ["cloud-platform"] service_account_scopes = ["cloud-platform"]

6
blueprints/data-solutions/data-platform-minimal/02-processing.tf
View File

@ -50,12 +50,12 @@ locals {
processing_subnet = ( processing_subnet = (
local.use_shared_vpc local.use_shared_vpc
? var.network_config.subnet_self_link ? var.network_config.subnet_self_link
: module.processing-vpc.0.subnet_self_links["${var.region}/${var.prefix}-processing"] : try(module.processing-vpc.0.subnet_self_links["${var.region}/${var.prefix}-processing"], null)
) )
processing_vpc = ( processing_vpc = (
local.use_shared_vpc local.use_shared_vpc
? var.network_config.network_self_link ? var.network_config.network_self_link
: module.processing-vpc.0.self_link : try(module.processing-vpc.0.self_link, null)
) )
} }
@ -101,7 +101,7 @@ module "processing-project" {
host_project = var.network_config.host_project host_project = var.network_config.host_project
service_identity_iam = { service_identity_iam = {
"roles/compute.networkUser" = [ "roles/compute.networkUser" = [
"cloudservices", "compute", "container-engine", "dataflow" "cloudservices", "compute", "container-engine", "dataflow", "dataproc"
] ]
"roles/composer.sharedVpcAgent" = [ "roles/composer.sharedVpcAgent" = [
"composer" "composer"

2
blueprints/data-solutions/data-platform-minimal/README.md
View File

@ -69,7 +69,7 @@ We use three groups to control access to resources:
### Virtual Private Cloud (VPC) design ### Virtual Private Cloud (VPC) design
As is often the case in real-world configurations, this blueprint accepts as input an existing [Shared-VPC](https://cloud.google.com/vpc/docs/shared-vpc) via the `network_config` variable. Make sure that the GKE API (`container.googleapis.com`) is enabled in the VPC host project. As is often the case in real-world configurations, this blueprint accepts as input an existing [Shared-VPC](https://cloud.google.com/vpc/docs/shared-vpc) via the `network_config` variable. Make sure that the GKE API (`container.googleapis.com`) is enabled in the VPC host project. Remember also to configure firewall rules needed for the different products you are going to use: Composer, Dataflow or Dataproc.
If the `network_config` variable is not provided, one VPC will be created in each project that supports network resources (load, transformation and orchestration). If the `network_config` variable is not provided, one VPC will be created in each project that supports network resources (load, transformation and orchestration).

20
modules/dataproc/README.md
View File

File diff suppressed because one or more lines are too long

1
modules/dataproc/variables.tf
View File

@ -49,6 +49,7 @@ variable "dataproc_config" {
num_instances = number num_instances = number
machine_type = string machine_type = string
min_cpu_platform = string min_cpu_platform = string
image_uri = string
disk_config = optional(object({ disk_config = optional(object({
boot_disk_type = string boot_disk_type = string
boot_disk_size_gb = number boot_disk_size_gb = number