Parameterize service discovery namespace #62
Merged
Conversation
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
samsternatretool
approved these changes
Oct 30, 2024
| }, | ||
| { | ||
| "name" : "WORKFLOW_TEMPORAL_CLUSTER_NAMESPACE", | ||
| "value" : var.temporal_cluster_config.namespace | ||
| }, | ||
| { | ||
| "name" : "WORKFLOW_TEMPORAL_CLUSTER_FRONTEND_HOST", | ||
| "value" : var.temporal_cluster_config.host | ||
| "value" : format("%s.%s", var.temporal_cluster_config.hostname, local.service_discovery_namespace) |
There was a problem hiding this comment.
Why did host become hostname?
There was a problem hiding this comment.
Because Terraform only supports constants in defaults, and the original default value of temporal.retoolsvc doesn't make sense anymore with the DNS name being dynamic.
| count = var.workflows_enabled ? 1 : 0 | ||
| name = "retoolsvc" | ||
| resource "aws_service_discovery_private_dns_namespace" "retool_namespace" { | ||
| count = (var.code_executor_enabled || var.workflows_enabled) ? 1 : 0 |
| @@ -1,13 +1,13 @@ | |||
| # namescape: temporal namespace to use for Retool Workflows. We recommend this is only used by Retool. | |||
| # host: hostname for Temporal Frontend service | |||
| # hostname: hostname for Temporal Frontend service | |||
There was a problem hiding this comment.
Ah ok, answered my own question from before.
| @@ -206,3 +206,7 @@ variable "task_propagate_tags" { | |||
| default = "TASK_DEFINITION" | |||
| } | |||
|
|
|||
| variable "service_discovery_namespace" { | |||
| type = string | |||
| description = "Service discovery namespace DNS name for Retool ECS cluster." | |||
There was a problem hiding this comment.
Should this have a default?
There was a problem hiding this comment.
This needs to be passed in from the calling module (aws_ecs), where it's computed as a local value.
jjlgao
reviewed
Oct 30, 2024
modules/aws_ecs/locals.tf
Outdated
| @@ -14,6 +14,8 @@ locals { | |||
| } | |||
| ] | |||
|
|
|||
| service_discovery_namespace = format("%s%s", replace(var.deployment_name, "-", ""), "svc") | |||
There was a problem hiding this comment.
should the default for this be var.service_discovery_namespace?
This was referenced Nov 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solves the issue of the service discovery namespace conflicting in the event you want to bring up more than one cluster in the same account using this module.