This repository has been archived by the owner on Aug 25, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor ESM deployment as a separate module (#14)
* Refactor ESM deployment as a separate module * Minor formatting fixes * Bump
- Loading branch information
Showing
10 changed files
with
481 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # CHANGELOG | ||
|
|
||
| ## 0.7.0 | ||
|
|
||
| ### Breaking Changes | ||
|
|
||
| - Minimum supported Terraform version is now 0.15 | ||
| - Refactor ESM deployment to be a separate sub-module |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,48 @@ | ||
| # Deploy Consul ESM | ||
| resource "helm_release" "consul_esm" { | ||
| count = var.enable_esm ? 1 : 0 | ||
|
|
||
| name = var.esm_release_name | ||
| chart = var.esm_chart_name | ||
| repository = var.esm_chart_repository | ||
| version = var.esm_chart_version | ||
| namespace = var.chart_namespace | ||
|
|
||
| max_history = var.max_history | ||
|
|
||
| values = [ | ||
| templatefile("${path.module}/templates/esm-values.yaml", local.esm_values), | ||
| ] | ||
| } | ||
|
|
||
| locals { | ||
| esm_values = { | ||
| replica = var.esm_replica | ||
| image = var.esm_image | ||
| tag = var.esm_tag | ||
|
|
||
| resources = jsonencode(var.esm_resources) | ||
| affinity = jsonencode(var.esm_affinity) | ||
| tolerations = jsonencode(var.esm_tolerations) | ||
|
|
||
| pod_security_context = jsonencode(var.esm_pod_security_context) | ||
| container_security_context = jsonencode(var.esm_container_security_context) | ||
| module "esm" { | ||
| source = "./modules/esm" | ||
|
|
||
| env = jsonencode(var.esm_env) | ||
| log_level = var.esm_log_level | ||
|
|
||
| service_name = var.esm_service_name | ||
| service_tag = var.esm_service_tag | ||
|
|
||
| kv_path = var.esm_kv_path | ||
|
|
||
| external_node_meta = jsonencode(var.esm_external_node_meta) | ||
|
|
||
| node_reconnect_timeout = var.esm_node_reconnect_timeout | ||
| node_probe_interval = var.esm_node_probe_interval | ||
| http_addr = var.esm_http_addr | ||
| ping_type = var.esm_ping_type | ||
|
|
||
| use_node_agent = var.esm_use_node_agent | ||
| node_agent_port = coalesce(var.esm_node_agent_port, var.tls_enabled ? 8501 : 8500) | ||
|
|
||
| tls_enabled = var.tls_enabled | ||
| tls_cacert = var.tls_ca != null ? jsonencode(var.tls_ca.cert) : "null" | ||
|
|
||
| tls_enable_auto_encrypt = var.tls_enable_auto_encrypt | ||
| consul_k8s_image = "${var.consul_k8s_image}:${var.consul_k8s_tag}" | ||
| consul_template_image = var.consul_template_image | ||
| server_address = coalesce(var.esm_server_address, "${coalesce(var.name, var.release_name)}-server.${var.chart_namespace}.svc") | ||
| server_port = coalesce(8501, var.esm_server_port) | ||
| count = var.enable_esm ? 1 : 0 | ||
|
|
||
| init_container_set_sysctl = var.esm_init_container_set_sysctl | ||
| } | ||
| esm_release_name = var.esm_release_name | ||
| esm_chart_name = var.esm_chart_name | ||
| esm_chart_repository = var.esm_chart_repository | ||
| esm_chart_version = var.esm_chart_version | ||
| chart_namespace = var.chart_namespace | ||
| max_history = var.max_history | ||
|
|
||
| esm_replica = var.esm_replica | ||
| esm_image = var.esm_image | ||
| esm_tag = var.esm_tag | ||
|
|
||
| esm_resources = var.esm_resources | ||
| esm_affinity = var.esm_affinity | ||
| esm_tolerations = var.esm_tolerations | ||
| esm_pod_security_context = var.esm_pod_security_context | ||
| esm_container_security_context = var.esm_container_security_context | ||
| esm_pod_annotations = var.esm_pod_annotations | ||
| esm_env = var.esm_env | ||
|
|
||
| esm_init_container_set_sysctl = var.esm_init_container_set_sysctl | ||
|
|
||
| esm_server_address = coalesce(var.esm_server_address, "${coalesce(var.name, var.release_name)}-server.${var.chart_namespace}.svc") | ||
| esm_server_port = var.esm_server_port | ||
| tls_enabled = var.tls_enabled | ||
| tls_ca = var.tls_ca | ||
| tls_enable_auto_encrypt = var.tls_enable_auto_encrypt | ||
| consul_k8s_image = var.consul_k8s_image | ||
|
|
||
| esm_log_level = var.esm_log_level | ||
| esm_service_name = var.esm_service_name | ||
| esm_service_tag = var.esm_service_tag | ||
| esm_kv_path = var.esm_kv_path | ||
| esm_external_node_meta = var.esm_external_node_meta | ||
| esm_node_reconnect_timeout = var.esm_node_reconnect_timeout | ||
| esm_node_probe_interval = var.esm_node_probe_interval | ||
| esm_http_addr = var.esm_http_addr | ||
| esm_ping_type = var.esm_ping_type | ||
|
|
||
| esm_use_node_agent = var.esm_use_node_agent | ||
| esm_node_agent_port = var.esm_node_agent_port | ||
|
|
||
| consul_template_image = var.consul_template_image | ||
| } |
Oops, something went wrong.