Skip to content
Open
Changes from all commits
Commits
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
36 changes: 12 additions & 24 deletions application/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@ locals {
common_advanced = lookup(lookup(var.values, "advanced", {}), "common", {})
all_secrets = lookup(local.common_advanced, "include_common_env_secrets", false) ? var.environment.secrets : {}
advanced_config = lookup(local.common_advanced, "app_chart", {})
common_environment_variables = var.environment.common_environment_variables
common_environment_variables = jsondecode(lookup(local.common_advanced, "include_common_env_variables", false) ? jsonencode(var.environment.common_environment_variables) : jsonencode({}))
spec_environment_variables = lookup(var.values.spec, "env", {})
include_common_env_variables = lookup(var.values.advanced.common, "include_common_env_variables", false)
common_env_vars = var.environment.common_environment_variables

env_vars = jsondecode(
local.include_common_env_variables
? jsonencode(merge(local.common_env_vars, local.spec_environment_variables))
: jsonencode(local.spec_environment_variables)
)
env_vars = merge(local.common_environment_variables, local.spec_environment_variables)
env_vars_str = {for key,value in local.env_vars: key => "${value}"}
deployment_id = lookup(local.common_advanced, "pass_deployment_id", false) ? var.environment.deployment_id : ""
taints = lookup(local.kubernetes_node_pool_details, "taints", [])
chart_name = lookup(lookup(lookup(var.values, "metadata", {}), "labels", {}), "resourceName", var.chart_name)
Expand Down Expand Up @@ -97,14 +91,13 @@ locals {
} : lookup(local.advanced_config_values, "pod_distribution", {}) : null
sidecars = lookup(var.values.spec, "sidecars", lookup(local.advanced_config_values, "sidecars", {}))
init_containers = lookup(var.values.spec, "init_containers", lookup(local.advanced_config_values, "init_containers", {}))

exclude_env_and_secret_values = try(
var.values.advanced.common.app_chart.values.exclude_env_and_secret_values,
[]
)

filtered_env_vars = {
for k, v in local.env_vars :
for k, v in local.env_vars_str :
k => v
if !(contains(local.exclude_env_and_secret_values, v))
}
Expand All @@ -114,13 +107,6 @@ locals {
k => v
if !(contains(local.exclude_env_and_secret_values, v))
}

final_env = merge(
local.filtered_env_vars,
local.build_id_env,
(local.deployment_id != "" ? { DEPLOYMENT_ID = local.deployment_id } : {}),
local.filtered_all_secrets
)
}

resource "helm_release" "app-chart" {
Expand Down Expand Up @@ -164,7 +150,13 @@ resource "helm_release" "app-chart" {
}),
yamlencode({
spec = {
env = local.final_env
env = merge(
lookup(local.dep_cluster, "globalVariables", {}),
local.filtered_env_vars,
local.build_id_env,
local.filtered_all_secrets,
length(local.deployment_id) > 0 ? { deployment_id = local.deployment_id } : {}
)
}
}),
yamlencode({
Expand All @@ -184,10 +176,6 @@ resource "helm_release" "app-chart" {
}
})
]

lifecycle {
ignore_changes = [chart]
}
}

module "sts-pvc" {
Expand All @@ -207,4 +195,4 @@ module "sts-pvc" {
"app.kubernetes.io/instance" = "${var.chart_name}-app-chart"
}, var.labels)
cloud_tags = var.environment.cloud_tags
}
}