fix
This commit is contained in:
@@ -3,7 +3,7 @@ locals {
|
|||||||
mongo-password = data.kubernetes_secret_v1.prj_mongo_secret.data["password"]
|
mongo-password = data.kubernetes_secret_v1.prj_mongo_secret.data["password"]
|
||||||
username = var.username==""?var.component==""?var.instance:var.component:var.username
|
username = var.username==""?var.component==""?var.instance:var.component:var.username
|
||||||
db_name = var.db_name==""?var.component==""?var.instance:var.component:var.db_name
|
db_name = var.db_name==""?var.component==""?var.instance:var.component:var.db_name
|
||||||
mongo-labels = merge(local.labels, {
|
mongo-labels = merge(var.labels, {
|
||||||
"app.kubernetes.io/component" = "mongo"
|
"app.kubernetes.io/component" = "mongo"
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
output "host" {
|
output "host" {
|
||||||
value = "${var.app_slug}-redis.${var.namespace}.svc"
|
value = "${local.app_slug}-redis.${var.namespace}.svc"
|
||||||
}
|
}
|
||||||
output "url" {
|
output "url" {
|
||||||
value = "redis://${var.app_slug}-redis.${var.namespace}.svc:6379"
|
value = "redis://${local.app_slug}-redis.${var.namespace}.svc:6379"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
locals {
|
locals {
|
||||||
app_slug = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
|
app_slug = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
|
||||||
redis-labels = merge(local.labels, {
|
redis-labels = merge(var.labels, {
|
||||||
"app.kubernetes.io/component" = "redis"
|
"app.kubernetes.io/component" = "redis"
|
||||||
})
|
})
|
||||||
cfg = merge({
|
cfg = merge({
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
output "name" {
|
output "name" {
|
||||||
value = "${var.app_slug}"
|
value = "${local.app_slug}"
|
||||||
}
|
}
|
||||||
output "default_definition" {
|
output "default_definition" {
|
||||||
value = {
|
value = {
|
||||||
"name" = "${var.app_slug}"
|
"name" = "${local.app_slug}"
|
||||||
"port" = {
|
"port" = {
|
||||||
"number" = var.ports[0]
|
"number" = var.ports[0]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user