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.

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

Remove datalake_custom_instance_groups input variable in cdp-deploy module #74

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Remove unused datalake_custom_instance_groups input variable
Signed-off-by: Jim Enright <jenright@cloudera.com>
  • Loading branch information
jimright committed Aug 8, 2024
commit 7e3972588d853d5af7c4dd3a0e4f1cad3844c8ce
1 change: 0 additions & 1 deletion modules/terraform-cdp-deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ No resources.
| <a name="input_create_cdp_credential"></a> [create\_cdp\_credential](#input\_create\_cdp\_credential) | Flag to specify if the CDP Cross Account Credential should be created. If set to false then cdp\_xacccount\_credential\_name should be a valid pre-existing credential. | `bool` | `true` | no |
| <a name="input_datalake_async_creation"></a> [datalake\_async\_creation](#input\_datalake\_async\_creation) | Flag to specify if Terraform should wait for CDP datalake resource creation/deletion | `bool` | `false` | no |
| <a name="input_datalake_call_failure_threshold"></a> [datalake\_call\_failure\_threshold](#input\_datalake\_call\_failure\_threshold) | Threshold value that specifies how many times should a single CDP Datalake API call failure happen before giving up the polling | `number` | `3` | no |
| <a name="input_datalake_custom_instance_groups"></a> [datalake\_custom\_instance\_groups](#input\_datalake\_custom\_instance\_groups) | A set of custom instance groups for the datalake. Only applicable for CDP deployment on AWS and GCP. | <pre>list(<br> object({<br> name = string,<br> instance_type = optional(string)<br> })<br> )</pre> | `null` | no |
| <a name="input_datalake_image"></a> [datalake\_image](#input\_datalake\_image) | The image to use for the datalake. Can only be used when the 'datalake\_version' parameter is set to null. You can use 'catalog' name and/or 'id' for selecting an image. | <pre>object({<br> id = optional(string)<br> catalog = optional(string)<br> })</pre> | `null` | no |
| <a name="input_datalake_java_version"></a> [datalake\_java\_version](#input\_datalake\_java\_version) | The Java major version to use on the datalake cluster. | `number` | `null` | no |
| <a name="input_datalake_name"></a> [datalake\_name](#input\_datalake\_name) | Name of the CDP datalake. Defaults to '<env\_prefix>-<aw\|az\|gc\|>-dl' if not specified. | `string` | `null` | no |
Expand Down
14 changes: 6 additions & 8 deletions modules/terraform-cdp-deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ module "cdp_on_aws" {
proxy_config_name = var.proxy_config_name
s3_guard_table_name = var.s3_guard_table_name

datalake_custom_instance_groups = var.datalake_custom_instance_groups
datalake_image = var.datalake_image
datalake_java_version = var.datalake_java_version
datalake_recipes = var.datalake_recipes
datalake_image = var.datalake_image
datalake_java_version = var.datalake_java_version
datalake_recipes = var.datalake_recipes
}

# ------- Call sub-module for Azure Deployment -------
Expand Down Expand Up @@ -239,9 +238,8 @@ module "cdp_on_gcp" {
log_service_account_email = var.gcp_log_service_account_email
raz_service_account_email = var.gcp_raz_service_account_email

datalake_custom_instance_groups = var.datalake_custom_instance_groups
datalake_image = var.datalake_image
datalake_java_version = var.datalake_java_version
datalake_recipes = var.datalake_recipes
datalake_image = var.datalake_image
datalake_java_version = var.datalake_java_version
datalake_recipes = var.datalake_recipes

}
7 changes: 3 additions & 4 deletions modules/terraform-cdp-deploy/modules/aws/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ resource "cdp_datalake_aws_datalake" "cdp_datalake" {
enable_ranger_raz = var.enable_raz
multi_az = var.multiaz

custom_instance_groups = var.datalake_custom_instance_groups
image = var.datalake_image
java_version = var.datalake_java_version
recipes = var.datalake_recipes
image = var.datalake_image
java_version = var.datalake_java_version
recipes = var.datalake_recipes

polling_options = {
async = var.datalake_async_creation
Expand Down
12 changes: 0 additions & 12 deletions modules/terraform-cdp-deploy/modules/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,6 @@ variable "datalake_version" {
default = "latest"
}

variable "datalake_custom_instance_groups" {
type = list(
object({
name = string,
instance_type = optional(string)
})
)

description = "A set of custom instance groups for the datalake."

}

variable "datalake_image" {
type = object({
id = optional(string)
Expand Down
7 changes: 3 additions & 4 deletions modules/terraform-cdp-deploy/modules/gcp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,9 @@ resource "cdp_datalake_gcp_datalake" "cdp_datalake" {
enable_ranger_raz = var.enable_raz
scale = var.datalake_scale

custom_instance_groups = var.datalake_custom_instance_groups
image = var.datalake_image
java_version = var.datalake_java_version
recipes = var.datalake_recipes
image = var.datalake_image
java_version = var.datalake_java_version
recipes = var.datalake_recipes

polling_options = {
async = var.datalake_async_creation
Expand Down
12 changes: 0 additions & 12 deletions modules/terraform-cdp-deploy/modules/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,6 @@ variable "datalake_version" {
default = "latest"
}

variable "datalake_custom_instance_groups" {
type = list(
object({
name = string,
instance_type = optional(string)
})
)

description = "A set of custom instance groups for the datalake."

}

variable "datalake_java_version" {
type = number

Expand Down
13 changes: 0 additions & 13 deletions modules/terraform-cdp-deploy/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -310,19 +310,6 @@ variable "datalake_polling_timeout" {
default = 90
}

variable "datalake_custom_instance_groups" {
type = list(
object({
name = string,
instance_type = optional(string)
})
)

description = "A set of custom instance groups for the datalake. Only applicable for CDP deployment on AWS and GCP."

default = null
}

# ------- CDP Environment Deployment - AWS specific -------
variable "encryption_key_arn" {
type = string
Expand Down
Loading