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.

Sign up for GitHub

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

CDPCP-12573 - Documentation for datahub_azure_cluster uses AWS VM sizes in the example #151

Merged
merged 1 commit into from
Aug 5, 2024
Merged

CDPCP-12573 - Documentation for datahub_azure_cluster uses AWS VM sizes in the example #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 32 additions & 36 deletions examples/resources/cdp_datahub_azure_cluster/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,79 +11,79 @@
resource "cdp_datahub_azure_cluster" "azure-cluster" {
name = "<value>"
environment = "<value>"
cluster_template = "7.2.15 - Data Engineering: Apache Spark, Apache Hive, Apache Oozie"
cluster_definition = "7.2.15 - Data Engineering for Azure"
cluster_template = "7.2.18 - Data Engineering: Apache Spark, Apache Hive, Apache Oozie"
cluster_definition = "7.2.18 - Data Engineering for Azure"
/* The below section kept here as a working example if one would like to use the cluster creation w/o the usage of the cluster definition

/*instance_group = [
instance_group = [
{
node_count = 0
instance_group_name = "gateway"
node_count = 3
instance_group_name = "worker"
instance_group_type = "CORE"
instance_type = "m5.2xlarge"
root_volume_size = 100
instance_type = "Standard_D16s_v3"
root_volume_size = 200
attached_volume_configuration = [
{
volume_size = 100
volume_size = 100
volume_count = 1
volume_type = "gp3"
volume_type = "StandardSSD_LRS"
}
]
recovery_mode = "MANUAL"
volume_encryption = {
encryption = false
}
recipes = []
recovery_mode = "MANUAL"
recipes = []
},
{
node_count = 1
node_count = 1
instance_group_name = "master"
instance_group_type = "GATEWAY"
instance_type = "m5.4xlarge"
root_volume_size = 100
instance_type = "Standard_D16s_v3"
root_volume_size = 200
attached_volume_configuration = [
{
volume_size = 100
volume_size = 100
volume_count = 1
volume_type = "gp3"
volume_type = "StandardSSD_LRS"
}
]
recovery_mode = "MANUAL"
volume_encryption = {
encryption = false
}
recipes = []
recovery_mode = "MANUAL"
recipes = []
},
{
node_count = 3
instance_group_name = "worker"
instance_group_type = "CORE"
instance_type = "r5d.2xlarge"
root_volume_size = 100
node_count = 1
instance_group_name = "compute"
instance_group_type = "CORE"
instance_type = "Standard_D16s_v3"
root_volume_size = 100
recovery_mode = "MANUAL"
attached_volume_configuration = [
{
volume_size = 300
volume_size = 100
volume_count = 1
volume_type = "gp3"
volume_type = "StandardSSD_LRS"
}
]
recovery_mode = "MANUAL"
volume_encryption = {
encryption = false
}
recipes = []
},
{
node_count = 3
instance_group_name = "compute"
node_count = 0
instance_group_name = "gateway"
instance_group_type = "CORE"
instance_type = "r5d.2xlarge"
root_volume_size = 100
instance_type = "Standard_D8s_v3"
root_volume_size = 200
attached_volume_configuration = [
{
volume_size = 300
volume_size = 300
volume_count = 1
volume_type = "ephemeral"
volume_type = "StandardSSD_LRS"
}
]
recovery_mode = "MANUAL"
Expand Down Expand Up @@ -160,10 +160,6 @@ output "recovery_mode" {
value = cdp_datahub_azure_cluster.azure-cluster.instance_group[*].recovery_mode
}

output "volume_encryption" {
value = cdp_datahub_azure_cluster.azure-cluster.instance_group[*].volume_encryption
}

output "encryption" {
value = cdp_datahub_azure_cluster.azure-cluster.instance_group[*].volume_encryption.encryption
}*/
2 changes: 1 addition & 1 deletion resources/datahub/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func fromModelToAzureRequest(model azureDatahubResourceModel, ctx context.Contex
tflog.Debug(ctx, fmt.Sprintf("%d instance group found in the input model.", len(model.InstanceGroup)))
for _, group := range model.InstanceGroup {
tflog.Debug(ctx, fmt.Sprintf("Converting InstanceGroupRequest: %+v.", group))
var volReqs []*datahubmodels.AttachedVolumeRequest
volReqs := make([]*datahubmodels.AttachedVolumeRequest, 0)
tflog.Debug(ctx, fmt.Sprintf("%d attached volume request found in the input model.", len(model.InstanceGroup)))
for _, vrs := range group.AttachedVolumeConfiguration {
tflog.Debug(ctx, fmt.Sprintf("Converting AttachedVolumeConfiguration: %+v.", vrs))
Expand Down
Loading