Skip to content

feat: COS Lite TF module TLS integrations #40

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

Merged
sed-i merged 21 commits into from
Jun 20, 2025
Merged

feat: COS Lite TF module TLS integrations #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f7e8189
feat: COS TF modules
MichaelThamm Jun 13, 2025
893c1c0
feat: tf CI
MichaelThamm Jun 13, 2025
8dd132a
chore: fmt TF file
MichaelThamm Jun 13, 2025
c53ad2a
feat: validate TF in CI
MichaelThamm Jun 16, 2025
95b02a0
test: validate TF CI
MichaelThamm Jun 16, 2025
e7f2b7b
chore: fix TF just recipes
MichaelThamm Jun 16, 2025
3cb84d3
fix: justfile TF recipes
MichaelThamm Jun 16, 2025
ea8c2f6
chore: revert test, solution works now
MichaelThamm Jun 16, 2025
ed567db
fix: Justfile and README
MichaelThamm Jun 16, 2025
a239fd0
chore: update module source paths
MichaelThamm Jun 16, 2025
0e2f14c
chore: add back the lint-workflows to PRs
MichaelThamm Jun 16, 2025
6c63963
feat: TF TLS part 1
MichaelThamm Jun 16, 2025
90bcd70
chore: flatten dir
MichaelThamm Jun 18, 2025
730a34a
Merge remote-tracking branch 'origin/main' into feat/tf-tls-relations
MichaelThamm Jun 18, 2025
b83b3b5
Merge remote-tracking branch 'origin/main' into feat/tf-tls-relations
MichaelThamm Jun 18, 2025
8fcc5c0
chore: lower case offers resources
MichaelThamm Jun 18, 2025
a037e9c
chore: cleanup PR
MichaelThamm Jun 19, 2025
549b9f9
chore: remove COS changes
MichaelThamm Jun 19, 2025
79af7a6
chore: update offers
MichaelThamm Jun 19, 2025
3139c62
chore: remove COS changes
MichaelThamm Jun 19, 2025
f2de92f
chore: undo the COS Lite removal
MichaelThamm Jun 19, 2025
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
108 changes: 96 additions & 12 deletions terraform/cos-lite/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ resource "juju_integration" "alertmanager_loki" {
}
}


resource "juju_integration" "grafana_source_alertmanager" {
model = var.model

Expand Down Expand Up @@ -140,7 +139,6 @@ resource "juju_integration" "grafana_self_monitoring_prometheus" {
}
}


# Provided by Prometheus

resource "juju_integration" "prometheus_grafana_dashboards_provider" {
Expand Down Expand Up @@ -171,9 +169,6 @@ resource "juju_integration" "prometheus_grafana_source" {
}
}




# Provided by Loki

resource "juju_integration" "loki_grafana_dashboards_provider" {
Expand Down Expand Up @@ -218,7 +213,6 @@ resource "juju_integration" "loki_self_monitoring_prometheus" {
}
}


# Provided by Catalogue

resource "juju_integration" "catalogue_alertmanager" {
Expand Down Expand Up @@ -263,7 +257,6 @@ resource "juju_integration" "catalogue_prometheus" {
}
}


# Provided by Traefik

resource "juju_integration" "alertmanager_ingress" {
Expand All @@ -280,7 +273,6 @@ resource "juju_integration" "alertmanager_ingress" {
}
}


resource "juju_integration" "catalogue_ingress" {
model = var.model

Expand Down Expand Up @@ -351,30 +343,122 @@ resource "juju_integration" "traefik_self_monitoring_prometheus" {
}
}

# Provided by Self-Signed-Certificates

resource "juju_integration" "alertmanager_certificates" {
count = var.use_tls ? 1 : 0
Comment thread
MichaelThamm marked this conversation as resolved.
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.alertmanager.app_name
endpoint = module.alertmanager.endpoints.certificates
}
}

resource "juju_integration" "catalogue_certificates" {
count = var.use_tls ? 1 : 0
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.catalogue.app_name
endpoint = module.catalogue.endpoints.certificates
}
}

resource "juju_integration" "grafana_certificates" {
count = var.use_tls ? 1 : 0
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.grafana.app_name
endpoint = module.grafana.endpoints.certificates
}
}

resource "juju_integration" "loki_certificates" {
count = var.use_tls ? 1 : 0
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.loki.app_name
endpoint = module.loki.endpoints.certificates
}
}

resource "juju_integration" "prometheus_certificates" {
count = var.use_tls ? 1 : 0
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.prometheus.app_name
endpoint = module.prometheus.endpoints.certificates
}
}

resource "juju_integration" "traefik_certificates" {
Comment thread
MichaelThamm marked this conversation as resolved.
count = var.use_tls ? 1 : 0
model = var.model

application {
name = module.ssc[0].app_name
endpoint = module.ssc[0].provides.certificates
}

application {
name = module.traefik.app_name
endpoint = module.traefik.endpoints.certificates
}
}

# -------------- # Offers --------------

resource "juju_offer" "alertmanager-karma-dashboard" {
resource "juju_offer" "alertmanager_karma_dashboard" {
name = "alertmanager-karma-dashboard"
model = var.model
application_name = module.alertmanager.app_name
endpoint = "karma-dashboard"
}

resource "juju_offer" "grafana-dashboards" {
resource "juju_offer" "grafana_dashboards" {
name = "grafana-dashboards"
model = var.model
application_name = module.grafana.app_name
endpoint = "grafana-dashboard"
}

resource "juju_offer" "loki-logging" {
resource "juju_offer" "loki_logging" {
name = "loki-logging"
model = var.model
application_name = module.loki.app_name
endpoint = "logging"
}

resource "juju_offer" "prometheus-receive-remote-write" {
resource "juju_offer" "prometheus_receive_remote_write" {
name = "prometheus-receive-remote-write"
model = var.model
application_name = module.prometheus.app_name
Expand Down
8 changes: 4 additions & 4 deletions terraform/cos-lite/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

output "offers" {
value = {
alertmanager_karma_dashboard = juju_offer.alertmanager-karma-dashboard
grafana_dashboards = juju_offer.grafana-dashboards
loki_logging = juju_offer.loki-logging
prometheus_receive_remote_write = juju_offer.prometheus-receive-remote-write
alertmanager_karma_dashboard = juju_offer.alertmanager_karma_dashboard
grafana_dashboards = juju_offer.grafana_dashboards
loki_logging = juju_offer.loki_logging
prometheus_receive_remote_write = juju_offer.prometheus_receive_remote_write
}
}

Expand Down
8 changes: 4 additions & 4 deletions terraform/cos/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,28 +578,28 @@ resource "juju_integration" "grafana_tracing_grafana_agent_traicing_provider" {

# -------------- # Offers --------------

resource "juju_offer" "alertmanager-karma-dashboard" {
resource "juju_offer" "alertmanager_karma_dashboard" {
name = "alertmanager-karma-dashboard"
model = var.model
application_name = module.alertmanager.app_name
endpoint = "karma-dashboard"
}

resource "juju_offer" "grafana-dashboards" {
resource "juju_offer" "grafana_dashboards" {
name = "grafana-dashboards"
model = var.model
application_name = module.grafana.app_name
endpoint = "grafana-dashboard"
}

resource "juju_offer" "loki-logging" {
resource "juju_offer" "loki_logging" {
name = "loki-logging"
model = var.model
application_name = module.loki.app_names.loki_coordinator
endpoint = "logging"
}

resource "juju_offer" "mimir-receive-remote-write" {
resource "juju_offer" "mimir_receive_remote_write" {
name = "mimir-receive-remote-write"
model = var.model
application_name = module.mimir.app_names.mimir_coordinator
Expand Down
8 changes: 4 additions & 4 deletions terraform/cos/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

output "offers" {
value = {
alertmanager_karma_dashboard = juju_offer.alertmanager-karma-dashboard
grafana_dashboards = juju_offer.grafana-dashboards
loki_logging = juju_offer.loki-logging
mimir_receive_remote_write = juju_offer.mimir-receive-remote-write
alertmanager_karma_dashboard = juju_offer.alertmanager_karma_dashboard
grafana_dashboards = juju_offer.grafana_dashboards
loki_logging = juju_offer.loki_logging
mimir_receive_remote_write = juju_offer.mimir_receive_remote_write
Comment thread
MichaelThamm marked this conversation as resolved.
}
}

Expand Down