diff --git a/examples/extras/xray/variables.xray.auto.tfvars b/examples/extras/xray/variables.xray.auto.tfvars index 91660ee..0af2f45 100644 --- a/examples/extras/xray/variables.xray.auto.tfvars +++ b/examples/extras/xray/variables.xray.auto.tfvars @@ -1,5 +1,6 @@ -xray_namespace = "aws-cloudwatch" -xray_name = "aws-xray" +xray_namespace = "aws-cloudwatch" +create_xray_namespace = true +xray_name = "aws-xray" xray_charts = { "xray" = { name = "aws-xray" diff --git a/examples/extras/xray/variables.xray.tf b/examples/extras/xray/variables.xray.tf index c466dd9..0709c04 100644 --- a/examples/extras/xray/variables.xray.tf +++ b/examples/extras/xray/variables.xray.tf @@ -4,6 +4,12 @@ variable "xray_namespace" { default = "default" } +variable "create_xray_namespace" { + description = "Flag to enable or disable creation of namespace" + type = bool + default = false +} + variable "xray_name" { description = "Service account name" type = string diff --git a/examples/extras/xray/xray.tf b/examples/extras/xray/xray.tf index 5832f5d..e87cf0b 100644 --- a/examples/extras/xray/xray.tf +++ b/examples/extras/xray/xray.tf @@ -34,6 +34,13 @@ locals { xray_images_output = { for k, v in module.images_xray.images : v.name => v } } +resource "kubernetes_namespace" "namespace" { + count = var.create_xray_namespace ? 1 : 0 + metadata { + name = var.xray_namespace + } +} + module "images_xray" { source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git?ref=tf-upgrade" @@ -61,7 +68,7 @@ resource "helm_release" "xray" { repository = var.xray_charts["xray"].use_remote ? var.xray_charts["xray"].repository : "${path.module}/charts" version = var.xray_charts["xray"].use_remote ? var.xray_charts["xray"].version : null - depends_on = [module.images_xray] + depends_on = [module.images_xray, kubernetes_namespace.namespace] set { name = "image.repository" value = split(":", local.xray_images_output["aws-xray-daemon"].dest_full_path)[0]