feat!: transition to slo_generator_image

examples/slo-generator/simple_example/README.md

@@ -16,12 +16,12 @@ To run this example, you'll need:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| gcr\_project\_id | Google Container registry project where image is hosted | `string` | `"slo-generator-ci-a2b4"` | no |
 | labels | Project labels | `map` | `{}` | no |
 | project\_id | Project id | `any` | n/a | yes |
 | region | Region | `string` | `"us-east1"` | no |
 | schedule | Cron-like Cloud Scheduler schedule | `string` | `"* * * * */1"` | no |
-| slo\_generator\_version | SLO generator version | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 
 ## Outputs
 

examples/slo-generator/simple_example/main.tf

@@ -31,7 +31,7 @@ module "slo-generator" {
   config                = local.config
   slo_configs           = local.slo_configs
   slo_generator_version = var.slo_generator_version
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   secrets = {
     PROJECT_ID = var.project_id
   }

examples/slo-generator/simple_example/variables.tf

@@ -28,14 +28,14 @@ variable "region" {
   default     = "us-east1"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container registry project where image is hosted"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
   description = "SLO generator version"
-  default     = "latest"
+  default     = "master"
 }
 
 variable "labels" {

examples/slo-generator/sre_export_cloudevent_eventarc/README.md

@@ -24,12 +24,12 @@ To run this example, you'll need:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| gcr\_project\_id | Google Container registry project where image is hosted | `string` | `"slo-generator-ci-a2b4"` | no |
 | labels | Project labels | `map` | `{}` | no |
 | project\_id | Project id | `any` | n/a | yes |
 | region | Region | `string` | `"us-east1"` | no |
 | schedule | Cron-like Cloud Scheduler schedule | `string` | `"* * * * */1"` | no |
-| slo\_generator\_version | SLO generator version | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 
 ## Outputs
 

examples/slo-generator/sre_export_cloudevent_eventarc/main.tf

@@ -32,7 +32,7 @@ module "slo-generator" {
   config                = local.config
   slo_configs           = local.slo_configs
   slo_generator_version = var.slo_generator_version
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   secrets = {
     PROJECT_ID        = var.project_id
     PUBSUB_TOPIC_NAME = google_pubsub_topic.topic.name
@@ -50,7 +50,7 @@ module "slo-generator-export" {
   region                = var.region
   config                = local.config_export
   slo_generator_version = var.slo_generator_version
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   secrets = {
     SRE_PROJECT_ID = var.project_id
   }

examples/slo-generator/sre_export_cloudevent_eventarc/variables.tf

@@ -28,14 +28,14 @@ variable "region" {
   default     = "us-east1"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container registry project where image is hosted"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
   description = "SLO generator version"
-  default     = "latest"
+  default     = "master"
 }
 
 variable "labels" {

examples/slo-generator/sre_export_cloudevent_exporter/README.md

@@ -30,10 +30,10 @@ To run this example, you'll need:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| gcr\_project\_id | Google Container Registry project to fetch slo-generator image from | `string` | `"slo-generator-ci-a2b4"` | no |
 | project\_id | SRE Project id | `any` | n/a | yes |
 | region | Region | `string` | `"us-east1"` | no |
-| slo\_generator\_version | Version of slo-generator image | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 | team1\_project\_id | Team 1 project id | `any` | n/a | yes |
 
 ## Outputs

examples/slo-generator/sre_export_cloudevent_exporter/main.tf

@@ -38,7 +38,7 @@ module "slo-generator" {
   region                = var.region
   config                = local.team1_config
   slo_configs           = local.team1_slo_configs
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   slo_generator_version = var.slo_generator_version
   service_account_email = google_service_account.team1_service_account.email
   secrets = {
@@ -64,7 +64,7 @@ module "slo-generator-export" {
   project_id            = var.project_id
   region                = var.region
   config                = local.sre_config
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   slo_generator_version = var.slo_generator_version
   service_account_email = local.service_account_email
   secrets = {

examples/slo-generator/sre_export_cloudevent_exporter/variables.tf

@@ -27,12 +27,12 @@ variable "team1_project_id" {
   description = "Team 1 project id"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container Registry project to fetch slo-generator image from"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
-  description = "Version of slo-generator image"
-  default     = "latest"
+  description = "SLO generator version"
+  default     = "master"
 }

examples/slo-generator/sre_service_advanced/README.md

@@ -29,12 +29,12 @@ To run this example, you'll need:
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | bigquery\_dataset\_name | BigQuery dataset to hold SLO reports | `string` | `"slo"` | no |
-| gcr\_project\_id | Google Container registry project where image is hosted | `string` | `"slo-generator-ci-a2b4"` | no |
 | project\_id | SRE Project id | `any` | n/a | yes |
 | pubsub\_topic\_name | PubSub topic name | `string` | `"slo-export"` | no |
 | region | Region | `string` | `"us-east1"` | no |
 | schedule | Cron-like Cloud Scheduler schedule | `string` | `"* * * * */1"` | no |
-| slo\_generator\_version | slo-generator image version | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 | team1\_project\_id | Team 1 project id | `any` | n/a | yes |
 | team2\_project\_id | Team 2 project id | `any` | n/a | yes |
 

examples/slo-generator/sre_service_advanced/sre.tf

@@ -34,7 +34,7 @@ module "slo-generator" {
   config                = local.sre_config
   service_account_email = local.service_account_email
   slo_configs           = local.sre_slo_configs
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   slo_generator_version = var.slo_generator_version
   secrets = {
     SRE_PROJECT_ID          = var.project_id

examples/slo-generator/sre_service_advanced/teams.tf

@@ -36,7 +36,7 @@ module "team1-slos" {
   region                = var.region
   config                = local.team1_config
   slo_configs           = local.team1_configs
-  gcr_project_id        = var.gcr_project_id
+  slo_generator_image   = var.slo_generator_image
   slo_generator_version = var.slo_generator_version
   secrets = {
     SRE_PROJECT_ID          = var.project_id

examples/slo-generator/sre_service_advanced/variables.tf

@@ -26,9 +26,14 @@ variable "team2_project_id" {
   description = "Team 2 project id"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container registry project where image is hosted"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
+}
+
+variable "slo_generator_version" {
+  description = "SLO generator version"
+  default     = "master"
 }
 
 variable "schedule" {
@@ -50,8 +55,3 @@ variable "bigquery_dataset_name" {
   description = "BigQuery dataset to hold SLO reports"
   default     = "slo"
 }
-
-variable "slo_generator_version" {
-  description = "slo-generator image version"
-  default     = "latest"
-}

examples/slo-generator/sre_shared_schedulers/README.md

@@ -31,12 +31,12 @@ To run this example, you'll need:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| gcr\_project\_id | Google Container registry project where image is hosted | `string` | `"slo-generator-ci-a2b4"` | no |
 | labels | Project labels | `map` | `{}` | no |
 | project\_id | Project id | `any` | n/a | yes |
 | region | Region | `string` | `"us-east1"` | no |
 | schedule | Cron-like Cloud Scheduler schedule | `string` | `"* * * * */1"` | no |
-| slo\_generator\_version | SLO generator version | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 
 ## Outputs
 

examples/slo-generator/sre_shared_schedulers/main.tf

@@ -57,7 +57,7 @@ module "slo-generator" {
   config                  = local.config
   slo_configs             = local.slo_configs
   slo_generator_version   = var.slo_generator_version
-  gcr_project_id          = var.gcr_project_id
+  slo_generator_image     = var.slo_generator_image
   create_cloud_schedulers = false
   secrets = {
     PROJECT_ID = var.project_id

examples/slo-generator/sre_shared_schedulers/variables.tf

@@ -28,14 +28,14 @@ variable "region" {
   default     = "us-east1"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container registry project where image is hosted"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
   description = "SLO generator version"
-  default     = "latest"
+  default     = "master"
 }
 
 variable "labels" {

examples/slo-generator/sre_shared_schedulers_pubsub/README.md

@@ -31,12 +31,12 @@ To run this example, you'll need:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| gcr\_project\_id | Google Container registry project where image is hosted | `string` | `"slo-generator-ci-a2b4"` | no |
 | labels | Project labels | `map` | `{}` | no |
 | project\_id | Project id | `any` | n/a | yes |
 | region | Region | `string` | `"us-east1"` | no |
 | schedule | Cron-like Cloud Scheduler schedule | `string` | `"* * * * */1"` | no |
-| slo\_generator\_version | SLO generator version | `string` | `"latest"` | no |
+| slo\_generator\_image | SLO generator image | `string` | `"ghcr.io/google/slo-generator"` | no |
+| slo\_generator\_version | SLO generator version | `string` | `"master"` | no |
 
 ## Outputs
 

examples/slo-generator/sre_shared_schedulers_pubsub/main.tf

@@ -58,7 +58,7 @@ module "slo-generator" {
   config                  = local.config
   slo_configs             = local.slo_configs
   slo_generator_version   = var.slo_generator_version
-  gcr_project_id          = var.gcr_project_id
+  slo_generator_image     = var.slo_generator_image
   create_cloud_schedulers = false
   secrets = {
     PROJECT_ID        = var.project_id

examples/slo-generator/sre_shared_schedulers_pubsub/variables.tf

@@ -28,14 +28,14 @@ variable "region" {
   default     = "us-east1"
 }
 
-variable "gcr_project_id" {
-  description = "Google Container registry project where image is hosted"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
   description = "SLO generator version"
-  default     = "latest"
+  default     = "master"
 }
 
 variable "labels" {

modules/slo-generator/main.tf

@@ -89,7 +89,7 @@ resource "google_cloud_run_service" "service" {
       service_account_name  = local.service_account_email
       container_concurrency = var.concurrency
       containers {
-        image   = "gcr.io/${var.gcr_project_id}/slo-generator:${var.slo_generator_version}"
+        image   = "${var.slo_generator_image}:${var.slo_generator_version}"
         command = ["slo-generator"]
         args = [
           "api",

modules/slo-generator/variables.tf

@@ -33,14 +33,14 @@ variable "slo_configs" {
   default     = []
 }
 
-variable "gcr_project_id" {
-  description = "slo-generator image project id"
-  default     = "slo-generator-ci-a2b4"
+variable "slo_generator_image" {
+  description = "SLO generator image"
+  default     = "ghcr.io/google/slo-generator"
 }
 
 variable "slo_generator_version" {
-  description = "slo-generator container image version"
-  default     = "latest"
+  description = "SLO generator version"
+  default     = "master"
 }
 
 variable "service_name" {