Main review mods 2023 12 06

aks/aks.tf

@@ -1,6 +1,7 @@
 module "aks" {
   depends_on = [random_string.string]
-  source     = "[email protected]:hpccsystems-solutions-lab/tlh-oss-terraform-azurerm-aks.git"
+  #source     = "[email protected]:hpccsystems-solutions-lab/tlh-oss-terraform-azurerm-aks.git"
+  source     = "https://github.com/hpccsystems-solutions-lab/tlh-oss-terraform-azurerm-aks.git"
   #source     = "/home/azureuser/temp/OSS/terraform-azurerm-aks"
 
   providers = {

aks/locals.tf

@@ -13,8 +13,8 @@ locals {
     node_type_version = "v2"
     node_size         = var.aks_node_sizes.roxie
     single_group      = false
-    min_capacity      = var.aks_capacity.roxie_min
-    max_capacity      = var.aks_capacity.roxie_max
+    min_capacity      = 1
+    max_capacity      = 3
     labels = {
       "lnrs.io/tier" = "standard"
       "workload"     = "roxiepool"
@@ -31,8 +31,8 @@ locals {
       node_type_version = "v2"      # v1, v2
       node_size         = var.aks_node_sizes.thor
       single_group      = false
-      min_capacity      = var.aks_capacity.thor_min
-      max_capacity      = var.aks_capacity.thor_max
+      min_capacity      = 1
+      max_capacity      = var.aks_thorpool_max_capacity
       labels = {
         "lnrs.io/tier" = "standard"
         "workload"     = "thorpool"
@@ -48,8 +48,8 @@ locals {
       node_type_version = "v1"
       node_size         = var.aks_node_sizes.serv
       single_group      = false
-      min_capacity      = var.aks_capacity.serv_min
-      max_capacity      = var.aks_capacity.serv_max
+      min_capacity      = 1
+      max_capacity      = 3
       labels = {
         "lnrs.io/tier" = "standard"
         "workload"     = "servpool"
@@ -65,8 +65,8 @@ locals {
       node_type_version = "v1"
       node_size         = var.aks_node_sizes.spray
       single_group      = false
-      min_capacity      = var.aks_capacity.spray_min
-      max_capacity      = var.aks_capacity.spray_max
+      min_capacity      = 0
+      max_capacity      = 6
       labels = {
         "lnrs.io/tier"  = "standard"
         "workload"      = "spraypool"

aks/outputs.tf

@@ -1,6 +1,6 @@
 output "advisor_recommendations" {
   description = "Advisor recommendations or 'none'"
-  value = data.azurerm_advisor_recommendations.advisor.recommendations == tolist([])? "none" : data.azurerm_advisor_recommendations.advisor.recommendations
+  value = data.azurerm_advisor_recommendations.advisor.recommendations
 }
 output "aks_login" {
   description = "Location of the aks credentials"

hpcc/hpcc.tf

@@ -1,5 +1,6 @@
 module "hpcc" {
-  source = "[email protected]:hpccsystems-solutions-lab/tlh-opinionated-terraform-azurerm-hpcc.git"
+  #source = "[email protected]:hpccsystems-solutions-lab/tlh-opinionated-terraform-azurerm-hpcc.git"
+  source = "https://github.com/hpccsystems-solutions-lab/tlh-opinionated-terraform-azurerm-hpcc.git"
 
   environment = local.metadata.environment
   productname = local.metadata.product_name

hpcc/lite-locals.tf → lite-locals.tf

@@ -1,5 +1,63 @@
+output "thor_max_jobs" {
+   value = var.thor_max_jobs
+}
+output "thor_num_workers" {
+   value = var.thor_num_workers
+}
+output "thor_node_size" {
+   value = var.aks_node_sizes.thor
+}
+output "thor_ns_spec" {
+   value = local.ns_spec[var.aks_node_sizes.thor]
+}
+output "thor_worker_cpus" {
+   value = var.thor_worker_cpus
+}
+output "thorWorkersPerNode" {
+   value = "local.ns_spec[${var.aks_node_sizes.thor}].cpu / var.thor_worker_cpus = ${local.thorWorkersPerNode}"
+}
+output "thor_worker_ram" {
+   value = "local.ns_spec[${var.aks_node_sizes.thor}].ram / local.thorWorkersPerNode = ${local.thor_worker_ram}"
+}
+output "nodesPer1Job" {
+   value = "var.thor_num_workers /  local.thorWorkersPerNode = ${local.nodesPer1Job}"
+}
+output "thorpool_max_capacity" {
+   value = "local.nodesPer1Job * var.thor_max_jobs = ${local.thorpool_max_capacity}"
+}
 locals {
-  helm_chart_timeout=600
+  ns_spec = {
+    "large" = {
+       cpu = 2
+       ram = 8
+    }
+    "xlarge" = {
+       cpu = 4
+       ram = 16
+    }
+    "2xlarge" = {
+       cpu = 8
+       ram = 32
+    }
+    "4xlarge" = {
+       cpu = 16
+       ram = 64
+    }
+  }
+
+  twpn = "${ local.ns_spec[var.aks_node_sizes.thor].cpu / var.thor_worker_cpus }"
+  thorWorkersPerNode = ceil(local.twpn) == local.twpn? local.twpn : "local.thorWorkersPerNode, ${local.twpn}, is not an integer because local.ns_spec[${var.aks_node_sizes.thor}].cpu, ${local.ns_spec[var.aks_node_sizes.thor].cpu}, is not a multiple of var.thor_worker_cpus, ${var.thor_worker_cpus}."
+
+  twr = "${local.ns_spec[var.aks_node_sizes.thor].ram / local.thorWorkersPerNode }"
+  thor_worker_ram = ceil(local.twr) == local.twr? local.twr : "local.thor_worker_ram, ${local.twr}, is not an integer because local.ns_spec[${var.aks_node_sizes.thor}].ram, ${local.ns_spec[var.aks_node_sizes.thor].ram}, is not a multiple of local.thorWorkersPerNode, ${local.thorWorkersPerNode}."
+
+  np1j = "${var.thor_num_workers /  local.thorWorkersPerNode }"
+  nodesPer1Job = ceil(local.np1j) == local.np1j? local.np1j : "local.nodesPer1Job, ${local.np1j}, is not an integer because var.thor_num_workers, ${var.thor_num_workers}, is not a multiple of local.thorWorkersPerNode, ${local.thorWorkersPerNode}."
+
+  thorpool_max_capacity = ceil("${ local.nodesPer1Job * var.thor_max_jobs }")
+
+  helm_chart_timeout=300
+  #hpcc_version = "8.6.20"
 
   owner = {
     name  = var.admin_username
@@ -8,17 +66,80 @@ locals {
 
   owner_name_initials = lower(join("",[for x in split(" ",local.owner.name): substr(x,0,1)]))
 
-  tags = var.extra_tags
+  /*metadata = {
+    project             = format("%shpccplatform", local.owner_name_initials)
+    product_name        = format("%shpccplatform", local.owner_name_initials)
+    business_unit       = "commercial"
+    environment         = "sandbox"
+    market              = "us"
+    product_group        = format("%shpcc", local.owner_name_initials)
+    resource_group_type = "app"
+    sre_team            = format("%shpccplatform", local.owner_name_initials)
+    subscription_type   = "dev"
+    additional_tags     = { "justification" = "testing" }
+    location            = var.aks_azure_region # Acceptable values: eastus, centralus
+  }
+
+  tags = merge(local.metadata.additional_tags, var.extra_tags)
+  */
 
+  # # disable_naming_conventions - Disable naming conventions
+  # # disable_naming_conventions = true 
   disable_naming_conventions = false
 
+  # # auto_launch_eclwatch - Automatically launch ECLWatch web interface.
+  #auto_launch_eclwatch = true
   auto_launch_svc = {
     eclwatch = false
   }
+
+  # azure_auth = {
+  #   #   AAD_CLIENT_ID     = ""
+  #   #   AAD_CLIENT_SECRET = ""
+  #   #   AAD_TENANT_ID     = ""
+  #   #   AAD_PRINCIPAL_ID  = ""
+  #   SUBSCRIPTION_ID = ""
+  # }
+
+  # hpcc_container = {
+  #   version = "9.2.0"
+  #   image_name    = "platform-core-ln"
+  #   image_root    = "jfrog.com/glb-docker-virtual"
+  #   #   custom_chart_version = "9.2.0-rc1"
+  #   #   custom_image_version = "9.2.0-demo"
+  # }
+
+  # hpcc_container_registry_auth = {
+  #   username = "value"
+  #   password = "value"
+  # }
 
   internal_domain = var.aks_dns_zone_name // Example: hpcczone.us-hpccsystems-dev.azure.lnrsg.io
 
   external = {}
+  # external = {
+  #   blob_nfs = [{
+  #     container_id         = ""
+  #     container_name       = ""
+  #     id                   = ""
+  #     resource_group_name  = var.storage_account_resource_group_name
+  #     storage_account_id   = ""
+  #     storage_account_name = var.storage_account_name
+  #   }]
+  #   # hpc_cache = [{
+  #   #   id     = ""
+  #   #   path   = ""
+  #   #   server = ""
+  #   }]
+  #   hpcc = [{
+  #     name = ""
+  #     planes = list(object({
+  #       local  = ""
+  #       remote = ""
+  #     }))
+  #     service = ""
+  #   }]
+  # }
 
   admin_services_storage_account_settings = {
     replication_type = "ZRS" #LRS only if using HPC Cache
@@ -43,6 +164,12 @@ locals {
           delete_protection = false
         }
       }
+      # hpc_cache = {
+      #   enabled                     = false
+      #   size                        = "small"
+      #   cache_update_frequency      = "3h"
+      #   storage_account_data_planes = null
+      # }
     }
     external = null
   }
@@ -63,6 +190,36 @@ locals {
     replicas     = 6
     nodeSelector = "spraypool"
   }
+
+  # ldap = {
+  #   ldap_server = "" //Server IP
+  #   dali = {
+  #     hpcc_admin_password = ""
+  #     hpcc_admin_username = ""
+  #     ldap_admin_password = ""
+  #     ldap_admin_username = ""
+  #     adminGroupName      = "HPCC-Admins"
+  #     filesBasedn         = "ou=files,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     groupsBasedn        = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     resourcesBasedn     = "ou=smc,ou=espservices,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     systemBasedn        = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     usersBasedn         = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     workunitsBasedn     = "ou=workunits,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #   }
+  #   esp = {
+  #     hpcc_admin_password = ""
+  #     hpcc_admin_username = ""
+  #     ldap_admin_password = ""
+  #     ldap_admin_username = ""
+  #     adminGroupName      = "HPCC-Admins"
+  #     filesBasedn         = "ou=files,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     groupsBasedn        = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     resourcesBasedn     = "ou=smc,ou=espservices,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     systemBasedn        = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     usersBasedn         = "OU=AADDC Users,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #     workunitsBasedn     = "ou=workunits,ou=eclHPCCSysUser,dc=z0lpf,dc=onmicrosoft,dc=com"
+  #   }
+  # }
 
   roxie_internal_service = {
     name        = "iroxie"
@@ -100,6 +257,7 @@ locals {
       disabled                       = (var.aks_enable_roxie == true)? false : true
       name                           = "roxie"
       nodeSelector                   = { workload = "roxiepool" }
+      # tlh 20231109 numChannels                    = 2
       numChannels                    = 1
       prefix                         = "roxie"
       replicas                       = 2
@@ -249,7 +407,7 @@ locals {
       type              = "hthor"
       spillPlane        = "spill"
       resources = {
-        cpu    = "2"
+        cpu    = "1"
         memory = "4G"
       }
       nodeSelector = { workload = "servpool" }
@@ -323,6 +481,7 @@ locals {
       throttle        = 0
       retryinterval   = 6
       keepResultFiles = false
+      # egress          = "engineEgress"
     }
 
     dfuwu-archiver = {
@@ -336,6 +495,7 @@ locals {
       cutoff   = 14
       at       = "* * * * *"
       throttle = 0
+      # egress   = "engineEgress"
     }
 
     dfurecovery-archiver = {
@@ -344,6 +504,7 @@ locals {
       limit    = 20
       cutoff   = 4
       at       = "* * * * *"
+      # egress   = "engineEgress"
     }
 
     file-expiry = {
@@ -353,6 +514,7 @@ locals {
       persistExpiryDefault = 7
       expiryDefault        = 4
       user                 = "sasha"
+      # egress               = "engineEgress"
     }
   }
 
@@ -385,15 +547,16 @@ locals {
     maxGraphs           = 2
     maxGraphStartupTime = 172800
     numWorkersPerPod    = 1
+    #nodeSelector        = {}
     nodeSelector        = { workload = "thorpool" }
     egress              = "engineEgress"
     tolerations_value   = "thorpool"
     managerResources = {
-      cpu    = 2
-      memory = "4G"
+      cpu    = 1
+      memory = "2G"
     }
     workerResources = {
-      cpu    = 4
+      cpu    = 3
       memory = "4G"
     }
     workerMemory = {