Merge branch 'master' into tfc-blueprint-miss-tmlp
This commit is contained in:
commit
9b6d1b59da
File diff suppressed because one or more lines are too long
|
@ -59,9 +59,9 @@ resource "google_dataproc_cluster" "cluster" {
|
||||||
dynamic "shielded_instance_config" {
|
dynamic "shielded_instance_config" {
|
||||||
for_each = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config == null ? [] : [""]
|
for_each = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config == null ? [] : [""]
|
||||||
content {
|
content {
|
||||||
enable_secure_boot = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.value.enable_secure_boot
|
enable_secure_boot = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.enable_secure_boot
|
||||||
enable_vtpm = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.value.enable_vtpm
|
enable_vtpm = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.enable_vtpm
|
||||||
enable_integrity_monitoring = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.value.enable_integrity_monitoring
|
enable_integrity_monitoring = var.dataproc_config.cluster_config.gce_cluster_config.shielded_instance_config.enable_integrity_monitoring
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,9 +99,9 @@ resource "google_dataproc_cluster" "cluster" {
|
||||||
dynamic "disk_config" {
|
dynamic "disk_config" {
|
||||||
for_each = var.dataproc_config.cluster_config.worker_config.disk_config == null ? [] : [""]
|
for_each = var.dataproc_config.cluster_config.worker_config.disk_config == null ? [] : [""]
|
||||||
content {
|
content {
|
||||||
boot_disk_type = var.dataproc_config.cluster_config.worker_config.disk_config.value.boot_disk_type
|
boot_disk_type = var.dataproc_config.cluster_config.worker_config.disk_config.boot_disk_type
|
||||||
boot_disk_size_gb = var.dataproc_config.cluster_config.worker_config.disk_config.value.boot_disk_size_gb
|
boot_disk_size_gb = var.dataproc_config.cluster_config.worker_config.disk_config.boot_disk_size_gb
|
||||||
num_local_ssds = var.dataproc_config.cluster_config.worker_config.disk_config.value.num_local_ssds
|
num_local_ssds = var.dataproc_config.cluster_config.worker_config.disk_config.num_local_ssds
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
image_uri = var.dataproc_config.cluster_config.worker_config.image_uri
|
image_uri = var.dataproc_config.cluster_config.worker_config.image_uri
|
||||||
|
@ -165,20 +165,20 @@ resource "google_dataproc_cluster" "cluster" {
|
||||||
dynamic "autoscaling_config" {
|
dynamic "autoscaling_config" {
|
||||||
for_each = var.dataproc_config.cluster_config.autoscaling_config == null ? [] : [""]
|
for_each = var.dataproc_config.cluster_config.autoscaling_config == null ? [] : [""]
|
||||||
content {
|
content {
|
||||||
policy_uri = var.dataproc_config.cluster_config.autoscaling_config.value.policy_uri
|
policy_uri = var.dataproc_config.cluster_config.autoscaling_config.policy_uri
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dynamic "initialization_action" {
|
dynamic "initialization_action" {
|
||||||
for_each = var.dataproc_config.cluster_config.initialization_action == null ? [] : [""]
|
for_each = var.dataproc_config.cluster_config.initialization_action == null ? [] : [""]
|
||||||
content {
|
content {
|
||||||
script = var.dataproc_config.cluster_config.initialization_action.value.script
|
script = var.dataproc_config.cluster_config.initialization_action.script
|
||||||
timeout_sec = var.dataproc_config.cluster_config.initialization_action.value.timeout_sec
|
timeout_sec = var.dataproc_config.cluster_config.initialization_action.timeout_sec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dynamic "encryption_config" {
|
dynamic "encryption_config" {
|
||||||
for_each = var.dataproc_config.cluster_config.encryption_config == null ? [] : [""]
|
for_each = try(var.dataproc_config.cluster_config.encryption_config.kms_key_name == null ? [] : [""], [])
|
||||||
content {
|
content {
|
||||||
kms_key_name = var.dataproc_config.cluster_config.encryption_config.value.kms_key_name
|
kms_key_name = var.dataproc_config.cluster_config.encryption_config.kms_key_name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dynamic "dataproc_metric_config" {
|
dynamic "dataproc_metric_config" {
|
||||||
|
@ -243,8 +243,8 @@ resource "google_dataproc_cluster" "cluster" {
|
||||||
dynamic "kubernetes_software_config" {
|
dynamic "kubernetes_software_config" {
|
||||||
for_each = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config == null ? [] : [""]
|
for_each = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config == null ? [] : [""]
|
||||||
content {
|
content {
|
||||||
component_version = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config.value.component_version
|
component_version = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config.component_version
|
||||||
properties = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config.value.properties
|
properties = var.dataproc_config.virtual_cluster_config.kubernetes_cluster_config.kubernetes_software_config.properties
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,9 +84,9 @@ variable "dataproc_config" {
|
||||||
}), null)
|
}), null)
|
||||||
}), null)
|
}), null)
|
||||||
software_config = optional(object({
|
software_config = optional(object({
|
||||||
image_version = string
|
image_version = optional(string, null)
|
||||||
override_properties = list(map(string))
|
override_properties = map(string)
|
||||||
optional_components = list(string)
|
optional_components = optional(list(string), null)
|
||||||
}), null)
|
}), null)
|
||||||
security_config = optional(object({
|
security_config = optional(object({
|
||||||
kerberos_config = object({
|
kerberos_config = object({
|
||||||
|
|
Loading…
Reference in New Issue