Skip to content

Commit 7604acb

Browse files
authored
Update module version to 0.12.0 and add azure variables (#79)
Signed-off-by: Jim Enright <[email protected]>
1 parent 55e51c7 commit 7604acb

File tree

7 files changed

+44
-14
lines changed

7 files changed

+44
-14
lines changed

aws/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
| Name | Source | Version |
2828
|------|--------|---------|
29-
| <a name="module_cdp_aws_prereqs"></a> [cdp\_aws\_prereqs](#module\_cdp\_aws\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs | v0.11.3 |
30-
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.11.3 |
29+
| <a name="module_cdp_aws_prereqs"></a> [cdp\_aws\_prereqs](#module\_cdp\_aws\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs | v0.12.0 |
30+
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.12.0 |
3131

3232
## Resources
3333

aws/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ provider "aws" {
4747
}
4848

4949
module "cdp_aws_prereqs" {
50-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.11.3"
50+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.12.0"
5151

5252
env_prefix = var.env_prefix
5353
aws_region = var.aws_region
@@ -90,7 +90,7 @@ module "cdp_aws_prereqs" {
9090
}
9191

9292
module "cdp_deploy" {
93-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.11.3"
93+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.12.0"
9494

9595
env_prefix = var.env_prefix
9696
datalake_image = var.datalake_image

azure/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
| Name | Version |
77
|------|---------|
88
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
9-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.46.0 |
9+
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >= 2.46.0, < 4.0.0 |
1010
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 4.0.0 |
1111
| <a name="requirement_cdp"></a> [cdp](#requirement\_cdp) | >= 0.6.1 |
1212
| <a name="requirement_http"></a> [http](#requirement\_http) | ~> 3.2.1 |
@@ -25,8 +25,8 @@
2525

2626
| Name | Source | Version |
2727
|------|--------|---------|
28-
| <a name="module_cdp_azure_prereqs"></a> [cdp\_azure\_prereqs](#module\_cdp\_azure\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs | v0.11.3 |
29-
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.11.3 |
28+
| <a name="module_cdp_azure_prereqs"></a> [cdp\_azure\_prereqs](#module\_cdp\_azure\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs | v0.12.0 |
29+
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.12.0 |
3030

3131
## Resources
3232

@@ -43,6 +43,7 @@
4343
| <a name="input_azure_region"></a> [azure\_region](#input\_azure\_region) | Region which Cloud resources will be created | `string` | n/a | yes |
4444
| <a name="input_deployment_template"></a> [deployment\_template](#input\_deployment\_template) | Deployment Pattern to use for Cloud resources and CDP | `string` | n/a | yes |
4545
| <a name="input_env_prefix"></a> [env\_prefix](#input\_env\_prefix) | Shorthand name for the environment. Used in resource descriptions | `string` | n/a | yes |
46+
| <a name="input_azure_create_private_endpoints"></a> [azure\_create\_private\_endpoints](#input\_azure\_create\_private\_endpoints) | Flag to specify if private endpoints should be created for Azure resources. If not specified the default is true for deployment\_template values of semi-private and private, otherwise false. | `bool` | `null` | no |
4647
| <a name="input_azure_subscription_id"></a> [azure\_subscription\_id](#input\_azure\_subscription\_id) | The subscription where the environment should be deployed to | `string` | `null` | no |
4748
| <a name="input_cdp_delegated_subnet_names"></a> [cdp\_delegated\_subnet\_names](#input\_cdp\_delegated\_subnet\_names) | List of subnet names delegated for Flexible Servers. Required if create\_vnet is false. | `list(any)` | `null` | no |
4849
| <a name="input_cdp_groups"></a> [cdp\_groups](#input\_cdp\_groups) | List of CDP Groups to be added to the IDBroker mappings of the environment. If create\_group is set to true then the group will be created. | <pre>set(object({<br/> name = string<br/> create_group = bool<br/> sync_membership_on_user_login = optional(bool)<br/> add_id_broker_mappings = bool<br/> })<br/> )</pre> | `null` | no |
@@ -52,6 +53,8 @@
5253
| <a name="input_cdp_vnet_name"></a> [cdp\_vnet\_name](#input\_cdp\_vnet\_name) | Pre-existing VNet Name for CDP environment. Required if create\_vnet is false. | `string` | `null` | no |
5354
| <a name="input_compute_cluster_configuration"></a> [compute\_cluster\_configuration](#input\_compute\_cluster\_configuration) | Kubernetes configuration for the externalized compute cluster. If not specified, a default configuration suitable for the requested deployment template will be used. | <pre>object({<br/> kube_api_authorized_ip_ranges = optional(set(string))<br/> outbound_type = optional(string)<br/> private_cluster = optional(bool)<br/> worker_node_subnets = optional(set(string))<br/> })</pre> | `null` | no |
5455
| <a name="input_compute_cluster_enabled"></a> [compute\_cluster\_enabled](#input\_compute\_cluster\_enabled) | Enable externalized compute cluster for the environment | `bool` | `false` | no |
56+
| <a name="input_create_delegated_subnet"></a> [create\_delegated\_subnet](#input\_create\_delegated\_subnet) | Flag to specify if the delegated subnet should be created. Only applicable if create\_vnet is true. When this is set to true the azure\_create\_private\_endpoints should be false. | `bool` | `false` | no |
57+
| <a name="input_create_nat_gateway"></a> [create\_nat\_gateway](#input\_create\_nat\_gateway) | Flag to specify if the NAT Gateway should be created. Only applicable if create\_vnet is true. | `bool` | `true` | no |
5558
| <a name="input_create_vnet"></a> [create\_vnet](#input\_create\_vnet) | Flag to specify if the VNet should be created | `bool` | `true` | no |
5659
| <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 |
5760
| <a name="input_datalake_image"></a> [datalake\_image](#input\_datalake\_image) | The image to use for the datalake. Can only be used when 'datalake\_version' is null. | <pre>object({<br/> id = optional(string)<br/> catalog_name = optional(string)<br/> os = optional(string)<br/> })</pre> | `null` | no |

azure/main.tf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ terraform {
2525
}
2626
azuread = {
2727
source = "hashicorp/azuread"
28-
version = "2.46.0"
28+
version = ">= 2.46.0, < 4.0.0"
2929
}
3030
tls = {
3131
source = "hashicorp/tls"
@@ -56,13 +56,15 @@ provider "azuread" {
5656
}
5757

5858
module "cdp_azure_prereqs" {
59-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs?ref=v0.11.3"
59+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-azure-pre-reqs?ref=v0.12.0"
6060

6161
env_prefix = var.env_prefix
6262
azure_region = var.azure_region
6363

6464
deployment_template = var.deployment_template
6565
ingress_extra_cidrs_and_ports = local.ingress_extra_cidrs_and_ports
66+
create_nat_gateway = var.create_nat_gateway
67+
create_delegated_subnet = var.create_delegated_subnet
6668

6769
# Inputs for BYO-VNet
6870
create_vnet = var.create_vnet
@@ -78,7 +80,7 @@ module "cdp_azure_prereqs" {
7880
}
7981

8082
module "cdp_deploy" {
81-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.11.3"
83+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.12.0"
8284

8385
env_prefix = var.env_prefix
8486
datalake_image = var.datalake_image
@@ -100,6 +102,8 @@ module "cdp_deploy" {
100102
environment_async_creation = var.environment_async_creation
101103
datalake_async_creation = var.datalake_async_creation
102104

105+
azure_create_private_endpoints = coalesce(var.azure_create_private_endpoints, var.deployment_template != "public")
106+
103107
# From pre-reqs module output
104108
azure_subscription_id = var.azure_subscription_id == null ? module.cdp_azure_prereqs.azure_subscription_id : var.azure_subscription_id
105109
azure_tenant_id = module.cdp_azure_prereqs.azure_tenant_id

azure/variables.tf

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,13 @@ variable "compute_cluster_configuration" {
200200
default = null
201201
}
202202

203+
variable "azure_create_private_endpoints" {
204+
type = bool
205+
description = "Flag to specify if private endpoints should be created for Azure resources. If not specified the default is true for deployment_template values of semi-private and private, otherwise false."
206+
207+
default = null
208+
}
209+
203210
# ------- Network Resources -------
204211
variable "ingress_extra_cidrs_and_ports" {
205212
type = object({
@@ -211,6 +218,22 @@ variable "ingress_extra_cidrs_and_ports" {
211218
default = null
212219
}
213220

221+
variable "create_nat_gateway" {
222+
type = bool
223+
224+
description = "Flag to specify if the NAT Gateway should be created. Only applicable if create_vnet is true."
225+
226+
default = true
227+
}
228+
229+
variable "create_delegated_subnet" {
230+
type = bool
231+
232+
description = "Flag to specify if the delegated subnet should be created. Only applicable if create_vnet is true. When this is set to true the azure_create_private_endpoints should be false."
233+
234+
default = false
235+
}
236+
214237
# ------- Optional inputs for BYO-VNet -------
215238
variable "create_vnet" {
216239
type = bool

gcp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
| Name | Source | Version |
2727
|------|--------|---------|
28-
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.11.3 |
29-
| <a name="module_cdp_gcp_prereqs"></a> [cdp\_gcp\_prereqs](#module\_cdp\_gcp\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs | v0.11.3 |
28+
| <a name="module_cdp_deploy"></a> [cdp\_deploy](#module\_cdp\_deploy) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy | v0.12.0 |
29+
| <a name="module_cdp_gcp_prereqs"></a> [cdp\_gcp\_prereqs](#module\_cdp\_gcp\_prereqs) | git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs | v0.12.0 |
3030

3131
## Resources
3232

gcp/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ provider "google" {
4545

4646

4747
module "cdp_gcp_prereqs" {
48-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs?ref=v0.11.3"
48+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-gcp-pre-reqs?ref=v0.12.0"
4949

5050
env_prefix = var.env_prefix
5151
gcp_region = var.gcp_region
@@ -62,7 +62,7 @@ module "cdp_gcp_prereqs" {
6262
}
6363

6464
module "cdp_deploy" {
65-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.11.3"
65+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.12.0"
6666

6767
env_prefix = var.env_prefix
6868
datalake_image = var.datalake_image

0 commit comments

Comments
 (0)