diff --git a/tests/integration/cos/tls_external/track-2.tf b/tests/integration/cos/tls_external/track-2.tf index 9766172c..be32fe8f 100644 --- a/tests/integration/cos/tls_external/track-2.tf +++ b/tests/integration/cos/tls_external/track-2.tf @@ -47,7 +47,7 @@ module "cos" { source = "git::https://github.com/canonical/observability-stack//terraform/cos?ref=track/2" model_uuid = data.juju_model.cos-model.uuid channel = "2/stable" - internal_tls = "false" + internal_tls = false external_certificates_offer_url = "admin/${var.ca_model}.certificates" external_ca_cert_offer_url = "admin/${var.ca_model}.send-ca-cert" @@ -55,7 +55,6 @@ module "cos" { s3_secret_key = var.s3_secret_key s3_access_key = var.s3_access_key - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable loki_coordinator = { units = 1 } loki_worker = { backend_units = 1, read_units = 1, write_units = 1 } mimir_coordinator = { units = 1 } diff --git a/tests/integration/cos/tls_full/track-2.tf b/tests/integration/cos/tls_full/track-2.tf index ce4b36bd..e1d350c0 100644 --- a/tests/integration/cos/tls_full/track-2.tf +++ b/tests/integration/cos/tls_full/track-2.tf @@ -47,7 +47,7 @@ module "cos" { source = "git::https://github.com/canonical/observability-stack//terraform/cos?ref=track/2" model_uuid = data.juju_model.cos-model.uuid channel = "2/stable" - internal_tls = "true" + internal_tls = true external_certificates_offer_url = "admin/${var.ca_model}.certificates" external_ca_cert_offer_url = "admin/${var.ca_model}.send-ca-cert" @@ -55,7 +55,6 @@ module "cos" { s3_secret_key = var.s3_secret_key s3_access_key = var.s3_access_key - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable loki_coordinator = { units = 1 } loki_worker = { backend_units = 1, read_units = 1, write_units = 1 } mimir_coordinator = { units = 1 } diff --git a/tests/integration/cos/tls_internal/track-2.tf b/tests/integration/cos/tls_internal/track-2.tf index 15e31d5a..b812dc55 100644 --- a/tests/integration/cos/tls_internal/track-2.tf +++ b/tests/integration/cos/tls_internal/track-2.tf @@ -33,13 +33,12 @@ module "cos" { source = "git::https://github.com/canonical/observability-stack//terraform/cos?ref=track/2" model_uuid = data.juju_model.model.uuid channel = "2/stable" - internal_tls = "true" + internal_tls = true s3_endpoint = var.s3_endpoint s3_secret_key = var.s3_secret_key s3_access_key = var.s3_access_key - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable loki_coordinator = { units = 1 } loki_worker = { backend_units = 1, read_units = 1, write_units = 1 } mimir_coordinator = { units = 1 } diff --git a/tests/integration/cos/tls_none/track-2.tf b/tests/integration/cos/tls_none/track-2.tf index 479becba..f7f4b42f 100644 --- a/tests/integration/cos/tls_none/track-2.tf +++ b/tests/integration/cos/tls_none/track-2.tf @@ -33,13 +33,12 @@ module "cos" { source = "git::https://github.com/canonical/observability-stack//terraform/cos?ref=track/2" model_uuid = data.juju_model.model.uuid channel = "2/stable" - internal_tls = "false" + internal_tls = false s3_endpoint = var.s3_endpoint s3_secret_key = var.s3_secret_key s3_access_key = var.s3_access_key - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable loki_coordinator = { units = 1 } loki_worker = { backend_units = 1, read_units = 1, write_units = 1 } mimir_coordinator = { units = 1 } diff --git a/tests/integration/cos_lite/tls_external/track-2.tf b/tests/integration/cos_lite/tls_external/track-2.tf index fb11292a..5e4f9bd6 100644 --- a/tests/integration/cos_lite/tls_external/track-2.tf +++ b/tests/integration/cos_lite/tls_external/track-2.tf @@ -35,9 +35,7 @@ module "cos-lite" { source = "git::https://github.com/canonical/observability-stack//terraform/cos-lite?ref=track/2" model_uuid = data.juju_model.cos-model.uuid channel = "2/stable" - internal_tls = "false" + internal_tls = false external_certificates_offer_url = "admin/${var.ca_model}.certificates" external_ca_cert_offer_url = "admin/${var.ca_model}.send-ca-cert" - - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable } diff --git a/tests/integration/cos_lite/tls_full/track-2.tf b/tests/integration/cos_lite/tls_full/track-2.tf index 12dbff49..491a54e9 100644 --- a/tests/integration/cos_lite/tls_full/track-2.tf +++ b/tests/integration/cos_lite/tls_full/track-2.tf @@ -35,10 +35,7 @@ module "cos-lite" { source = "git::https://github.com/canonical/observability-stack//terraform/cos-lite?ref=track/2" model_uuid = data.juju_model.cos-model.uuid channel = "2/stable" - internal_tls = "true" + internal_tls = true external_certificates_offer_url = "admin/${var.ca_model}.certificates" external_ca_cert_offer_url = "admin/${var.ca_model}.send-ca-cert" - - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable } - diff --git a/tests/integration/cos_lite/tls_internal/track-2.tf b/tests/integration/cos_lite/tls_internal/track-2.tf index fbcbdaa3..d47fb0f7 100644 --- a/tests/integration/cos_lite/tls_internal/track-2.tf +++ b/tests/integration/cos_lite/tls_internal/track-2.tf @@ -21,7 +21,5 @@ module "cos-lite" { source = "git::https://github.com/canonical/observability-stack//terraform/cos-lite?ref=track/2" model_uuid = data.juju_model.model.uuid channel = "2/stable" - internal_tls = "true" - - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable + internal_tls = true } diff --git a/tests/integration/cos_lite/tls_none/track-2.tf b/tests/integration/cos_lite/tls_none/track-2.tf index e94708d5..6646e166 100644 --- a/tests/integration/cos_lite/tls_none/track-2.tf +++ b/tests/integration/cos_lite/tls_none/track-2.tf @@ -21,7 +21,5 @@ module "cos-lite" { source = "git::https://github.com/canonical/observability-stack//terraform/cos-lite?ref=track/2" model_uuid = data.juju_model.model.uuid channel = "2/stable" - internal_tls = "false" - - traefik = { channel = "latest/edge" } # TODO: Switch to latest/stable when rev257 hits stable + internal_tls = false }