Skip to content

chore (track/2): cleanup TF tests #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MichaelThamm wants to merge 1 commit into
base: track/2
Choose a base branch
from
Draft

chore (track/2): cleanup TF tests #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/integration/cos/tls_external/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ 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"

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 }
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/cos/tls_full/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ 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"

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 }
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/cos/tls_internal/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/cos/tls_none/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 1 addition & 3 deletions tests/integration/cos_lite/tls_external/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
5 changes: 1 addition & 4 deletions tests/integration/cos_lite/tls_full/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

4 changes: 1 addition & 3 deletions tests/integration/cos_lite/tls_internal/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 1 addition & 3 deletions tests/integration/cos_lite/tls_none/track-2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading