fix: Cleanup TF product modules

terraform/cos-lite/README.md

@@ -37,8 +37,8 @@ This is a Terraform module facilitating the deployment of the COS Lite solution,
 | <a name="input_model_uuid"></a> [model\_uuid](#input\_model\_uuid) | Reference to an existing model resource or data source for the model to deploy to | `string` | n/a | yes |
 | <a name="input_prometheus"></a> [prometheus](#input\_prometheus) | Application configuration for Prometheus. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "prometheus")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
 | <a name="input_risk"></a> [risk](#input\_risk) | Risk level that the applications are (unless overwritten by individual channels) deployed from | `string` | `"edge"` | no |
-| <a name="input_ssc"></a> [ssc](#input\_ssc) | Application configuration for self-signed-certificates. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "ca")<br/>    channel            = optional(string, "1/stable")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
-| <a name="input_traefik"></a> [traefik](#input\_traefik) | Application configuration for Traefik. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "traefik")<br/>    channel            = optional(string, "latest/stable")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
+| <a name="input_ssc"></a> [ssc](#input\_ssc) | Application configuration for self-signed-certificates. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "ca")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
+| <a name="input_traefik"></a> [traefik](#input\_traefik) | Application configuration for Traefik. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "traefik")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
 
 ## Outputs
 

terraform/cos-lite/locals.tf

@@ -1,13 +1,19 @@
 locals {
   tls_termination = var.external_certificates_offer_url != null ? true : false
+  traefik_base    = "ubuntu@20.04"
   tracks = {
-    alertmanager = "0.31"
-    catalogue    = "3.0"
-    grafana      = "12.4"
-    loki         = "3.7"
-    prometheus   = "3.10"
-    ssc          = "latest"
-    traefik      = "latest"
+    alertmanager = "dev"
+    catalogue    = "dev"
+    grafana      = "dev"
+    loki         = "dev"
+    prometheus   = "dev"
+    # alertmanager = "0.31"
+    # catalogue    = "3.0"
+    # grafana      = "12.4"
+    # loki         = "3.7"
+    # prometheus   = "3.10"
+    ssc     = "1"
+    traefik = "latest"
   }
   channels = {
     alertmanager = "${local.tracks.alertmanager}/${var.risk}"

terraform/cos-lite/upgrades.tf

@@ -39,5 +39,5 @@ data "juju_charm" "ssc_info" {
 data "juju_charm" "traefik_info" {
   charm   = "traefik-k8s"
   channel = local.channels.traefik
-  base    = var.base
+  base    = local.traefik_base
 }

terraform/cos-lite/variables.tf

@@ -134,7 +134,6 @@ variable "prometheus" {
 variable "ssc" {
   type = object({
     app_name           = optional(string, "ca")
-    channel            = optional(string, "1/stable")
     config             = optional(map(string), {})
     constraints        = optional(string, "arch=amd64")
     revision           = optional(number, null)
@@ -148,7 +147,6 @@ variable "ssc" {
 variable "traefik" {
   type = object({
     app_name           = optional(string, "traefik")
-    channel            = optional(string, "latest/stable")
     config             = optional(map(string), {})
     constraints        = optional(string, "arch=amd64")
     revision           = optional(number, null)

terraform/cos/README.md

@@ -51,13 +51,13 @@ This is a Terraform module facilitating the deployment of the COS solution, usin
 | <a name="input_risk"></a> [risk](#input\_risk) | Risk level that the applications are (unless overwritten by individual channels) deployed from | `string` | `"edge"` | no |
 | <a name="input_s3_access_key"></a> [s3\_access\_key](#input\_s3\_access\_key) | S3 access-key credential | `string` | n/a | yes |
 | <a name="input_s3_endpoint"></a> [s3\_endpoint](#input\_s3\_endpoint) | S3 endpoint | `string` | n/a | yes |
-| <a name="input_s3_integrator"></a> [s3\_integrator](#input\_s3\_integrator) | Application configuration for all S3-integrators in coordinated workers. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    channel            = optional(string, "2/edge")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
+| <a name="input_s3_integrator"></a> [s3\_integrator](#input\_s3\_integrator) | Application configuration for all S3-integrators in coordinated workers. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
 | <a name="input_s3_secret_key"></a> [s3\_secret\_key](#input\_s3\_secret\_key) | S3 secret-key credential | `string` | n/a | yes |
-| <a name="input_ssc"></a> [ssc](#input\_ssc) | Application configuration for Self-signed-certificates. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "ca")<br/>    channel            = optional(string, "1/stable")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
+| <a name="input_ssc"></a> [ssc](#input\_ssc) | Application configuration for Self-signed-certificates. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "ca")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
 | <a name="input_tempo_bucket"></a> [tempo\_bucket](#input\_tempo\_bucket) | Tempo bucket name | `string` | `"tempo"` | no |
 | <a name="input_tempo_coordinator"></a> [tempo\_coordinator](#input\_tempo\_coordinator) | Application configuration for Tempo Coordinator. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 3)<br/>  })</pre> | `{}` | no |
 | <a name="input_tempo_worker"></a> [tempo\_worker](#input\_tempo\_worker) | Application configuration for all Tempo workers. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    querier_config                              = optional(map(string), {})<br/>    query_frontend_config                       = optional(map(string), {})<br/>    ingester_config                             = optional(map(string), {})<br/>    distributor_config                          = optional(map(string), {})<br/>    compactor_config                            = optional(map(string), {})<br/>    metrics_generator_config                    = optional(map(string), {})<br/>    constraints                                 = optional(string, "arch=amd64")<br/>    revision                                    = optional(number, null)<br/>    compactor_worker_storage_directives         = optional(map(string), {})<br/>    distributor_worker_storage_directives       = optional(map(string), {})<br/>    ingester_worker_storage_directives          = optional(map(string), {})<br/>    metrics_generator_worker_storage_directives = optional(map(string), {})<br/>    querier_worker_storage_directives           = optional(map(string), {})<br/>    query_frontend_worker_storage_directives    = optional(map(string), {})<br/>    compactor_units                             = optional(number, 3)<br/>    distributor_units                           = optional(number, 3)<br/>    ingester_units                              = optional(number, 3)<br/>    metrics_generator_units                     = optional(number, 3)<br/>    querier_units                               = optional(number, 3)<br/>    query_frontend_units                        = optional(number, 3)<br/>  })</pre> | `{}` | no |
-| <a name="input_traefik"></a> [traefik](#input\_traefik) | Application configuration for Traefik. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "traefik")<br/>    channel            = optional(string, "latest/stable")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
+| <a name="input_traefik"></a> [traefik](#input\_traefik) | Application configuration for Traefik. For more details: https://registry.terraform.io/providers/juju/juju/latest/docs/resources/application | <pre>object({<br/>    app_name           = optional(string, "traefik")<br/>    config             = optional(map(string), {})<br/>    constraints        = optional(string, "arch=amd64")<br/>    revision           = optional(number, null)<br/>    storage_directives = optional(map(string), {})<br/>    units              = optional(number, 1)<br/>  })</pre> | `{}` | no |
 
 ## Outputs
 

terraform/cos/locals.tf

@@ -1,17 +1,26 @@
 locals {
   clouds          = ["aws", "self-managed"] # list of k8s clouds where this COS module can be deployed.
   tls_termination = var.external_certificates_offer_url != null ? true : false
+  traefik_base    = "ubuntu@20.04"
   tracks = {
-    alertmanager  = "0.31"
-    catalogue     = "3.0"
-    grafana       = "12.4"
-    loki          = "3.7"
-    mimir         = "3.0"
-    otelcol       = "0.130"
+    alertmanager = "dev"
+    catalogue    = "dev"
+    grafana      = "dev"
+    loki         = "dev"
+    mimir        = "dev"
+    otelcol      = "dev"
+    tempo        = "dev"
+
+    # alertmanager  = "0.31"
+    # catalogue     = "3.0"
+    # grafana       = "12.4"
+    # loki          = "3.7"
+    # mimir         = "3.0"
+    # otelcol       = "0.130"
     s3_integrator = "2"
-    ssc           = "latest"
-    tempo         = "2.10"
-    traefik       = "latest"
+    ssc           = "1"
+    # tempo         = "2.10"
+    traefik = "latest"
   }
   channels = {
     alertmanager  = "${local.tracks.alertmanager}/${var.risk}"

terraform/cos/upgrades.tf

@@ -67,13 +67,13 @@ data "juju_charm" "ssc_info" {
 }
 
 data "juju_charm" "s3_integrator_info" {
-  charm   = "s3-integrator-k8s"
+  charm   = "s3-integrator"
   channel = local.channels.s3_integrator
   base    = var.base
 }
 
 data "juju_charm" "traefik_info" {
   charm   = "traefik-k8s"
   channel = local.channels.traefik
-  base    = var.base
+  base    = local.traefik_base
 }

terraform/cos/variables.tf

@@ -238,7 +238,6 @@ variable "opentelemetry_collector" {
 variable "ssc" {
   type = object({
     app_name           = optional(string, "ca")
-    channel            = optional(string, "1/stable")
     config             = optional(map(string), {})
     constraints        = optional(string, "arch=amd64")
     revision           = optional(number, null)
@@ -251,7 +250,6 @@ variable "ssc" {
 
 variable "s3_integrator" {
   type = object({
-    channel            = optional(string, "2/edge")
     config             = optional(map(string), {})
     constraints        = optional(string, "arch=amd64")
     revision           = optional(number, null)
@@ -304,7 +302,6 @@ variable "tempo_worker" {
 variable "traefik" {
   type = object({
     app_name           = optional(string, "traefik")
-    channel            = optional(string, "latest/stable")
     config             = optional(map(string), {})
     constraints        = optional(string, "arch=amd64")
     revision           = optional(number, null)