Skip to content

Commit e271d14

Browse files
Use deepmerge for merging Helm chart values
1 parent acb2cae commit e271d14

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

main.tf

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,23 @@ locals {
6464
}
6565

6666
# Select the appropriate yaml_values based on k8s_provider
67-
provider_liqo_yaml_values = merge(
67+
liqo_yaml_values = merge(
6868
{ for v in module.liqo_helm_values_gke : "gke" => v.liqo_yaml_values },
6969
{ for v in module.liqo_helm_values_eks : "eks" => v.liqo_yaml_values },
7070
{ for v in module.liqo_helm_values_aks : "aks" => v.liqo_yaml_values },
7171
)
72-
provider_specific_liqo_yaml_values = local.provider_liqo_yaml_values[var.k8s_provider]
72+
}
73+
74+
module "liqo_helm_values" {
75+
source = "cloudposse/config/yaml//modules/deepmerge"
76+
version = "0.2.0"
77+
maps = [
78+
local.common_liqo_yaml_values,
79+
local.liqo_yaml_values[var.k8s_provider].liqo,
80+
]
81+
}
7382

83+
locals {
7484
helm_yaml_values = {
7585
castai = {
7686
apiUrl = var.api_url
@@ -79,10 +89,7 @@ locals {
7989
clusterID = var.cluster_id
8090
clusterName = var.cluster_name
8191
}
82-
liqo = merge(
83-
local.provider_specific_liqo_yaml_values.liqo,
84-
local.common_liqo_yaml_values
85-
)
92+
liqo = module.liqo_helm_values.merged
8693
}
8794
}
8895

0 commit comments

Comments
 (0)