HPCC-27614 Fix volume mounts on storage account.

Signed-off-by: Godson Fortil <[email protected]>

main.tf

@@ -48,7 +48,6 @@ module "kubernetes" {
   tags                = local.tags
   resource_group_name = module.resource_group.name
   identity_type       = "UserAssigned" # Allowed values: UserAssigned or SystemAssigned
-
   rbac = {
     enabled        = false
     ad_integration = false
@@ -134,7 +133,7 @@ resource "helm_release" "hpcc" {
   lint                       = try(var.hpcc.lint, false)
 
   values = concat(var.hpcc.expose_eclwatch ? [file("${path.root}/values/esp.yaml")] : [],
-  try([for v in var.hpcc.values : file(v)], []), [file("${path.root}/values/values-retained-azurefile.yaml")])
+  [file("${path.root}/values/values-retained-azurefile.yaml")], try([for v in var.hpcc.values : file(v)], []))
 
   dynamic "set" {
     for_each = can(var.hpcc.image_root) ? [1] : []
@@ -219,7 +218,7 @@ resource "helm_release" "storage" {
   chart                      = can(var.storage.remote_chart) ? "hpcc-azurefile" : var.storage.local_chart
   repository                 = can(var.storage.remote_chart) ? var.storage.remote_chart : null
   version                    = can(var.storage.version) ? var.storage.version : null
-  values                     = concat(can(var.storage.storage_account.name) ? [file("${path.root}/values/hpcc-azurefile.yaml")] : [], try([for v in var.storage.values : file(v)], []))
+  values                     = concat(var.storage.default == true ? [] : [file("${path.root}/values/hpcc-azurefile.yaml")], try([for v in var.storage.values : file(v)], []))
   create_namespace           = true
   namespace                  = try(var.hpcc.namespace, terraform.workspace)
   atomic                     = try(var.storage.atomic, false)

values/hpcc-azurefile.yaml

@@ -3,6 +3,7 @@ common:
   mountPrefix: "/var/lib/HPCCSystems"
   secretName: "azure-secret"
   secretNamespace: "default"
+  provisioner: "file.csi.azure.com" # Set to "kubernetes.io/azure-file" if  not use csi driver but it is not recommaned.
 
 planes:
 - name: dali
@@ -11,31 +12,36 @@ planes:
   category: dali
   sku: "Standard_LRS"
   shareName: dalishare
+  #volumeId: "100-dali"
 - name: dll
   subPath: queries # cannot currently be changed
   size: 1Gi
   category: dll
   rwmany: true
   sku: "Standard_LRS"
   shareName: dllsshare
+  #volumeId: "100-queries"
 - name: sasha
   subPath: sasha
   size: 1Gi
   rwmany: true
   category: sasha
   sku: "Standard_LRS"
   shareName: sashashare
+  #volumeId: "100-sasha"
 - name: data
   subPath: hpcc-data # cannot currently be changed
   size: 3Gi
   category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
   rwmany: true
   sku: "Standard_LRS"
   shareName: datashare
+  #volumeId: "100-data"
 - name: mydropzone
   subPath: dropzone
   size: 1Gi
   rwmany: true
   category: lz
   sku: "Standard_LRS"
-  shareName: lzshare
+  shareName: lzshare
+  #volumeId: "100-mydropzone"