From 60f1f48d31e6f030d14491b20c10564bdc0717b7 Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Mon, 2 Dec 2024 08:37:58 -0800 Subject: [PATCH] pin otel Signed-off-by: Kenny Leung --- modules/cron/README.md | 2 +- modules/cron/variables.tf | 2 +- modules/regional-go-service/README.md | 2 +- modules/regional-go-service/variables.tf | 2 +- modules/regional-service/README.md | 2 +- modules/regional-service/variables.tf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cron/README.md b/modules/cron/README.md index 590ae521..41f205a5 100644 --- a/modules/cron/README.md +++ b/modules/cron/README.md @@ -112,7 +112,7 @@ No modules. | [memory](#input\_memory) | The memory limit for the job. | `string` | `"512Mi"` | no | | [name](#input\_name) | Name to prefix to created resources. | `any` | n/a | yes | | [notification\_channels](#input\_notification\_channels) | List of notification channels to alert. | `list(string)` | n/a | yes | -| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib:latest"` | no | +| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf"` | no | | [parallelism](#input\_parallelism) | The number of parallel jobs to run. Must be <= task\_count | `number` | `1` | no | | [paused](#input\_paused) | Whether the cron scheduler is paused or not. | `bool` | `false` | no | | [project\_id](#input\_project\_id) | The project that will host the cron job. | `string` | n/a | yes | diff --git a/modules/cron/variables.tf b/modules/cron/variables.tf index c3878538..0e876eac 100644 --- a/modules/cron/variables.tf +++ b/modules/cron/variables.tf @@ -185,7 +185,7 @@ variable "enable_otel_sidecar" { variable "otel_collector_image" { type = string - default = "chainguard/opentelemetry-collector-contrib:latest" + default = "chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf" description = "The otel collector image to use as a base. Must be on gcr.io or dockerhub." } diff --git a/modules/regional-go-service/README.md b/modules/regional-go-service/README.md index dc167ffb..aa41dfbf 100644 --- a/modules/regional-go-service/README.md +++ b/modules/regional-go-service/README.md @@ -103,7 +103,7 @@ No requirements. | [labels](#input\_labels) | Labels to apply to the service. | `map(string)` | `{}` | no | | [name](#input\_name) | n/a | `string` | n/a | yes | | [notification\_channels](#input\_notification\_channels) | List of notification channels to alert. | `list(string)` | n/a | yes | -| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib:latest"` | no | +| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf"` | no | | [project\_id](#input\_project\_id) | n/a | `string` | n/a | yes | | [regional-volumes](#input\_regional-volumes) | The volumes to make available to the containers in the service for mounting. | 
list(object({
    name = string
    gcs = optional(map(object({
      bucket    = string
      read_only = optional(bool, true)
    })), {})
    nfs = optional(map(object({
      server    = string
      path      = string
      read_only = optional(bool, true)
    })), {})
  }))
| `[]` | no | | [regions](#input\_regions) | A map from region names to a network and subnetwork. A service will be created in each region configured to egress the specified traffic via the specified subnetwork. | 
map(object({
    network = string
    subnet  = string
  }))
| n/a | yes | diff --git a/modules/regional-go-service/variables.tf b/modules/regional-go-service/variables.tf index 9f4e1976..23f08be4 100644 --- a/modules/regional-go-service/variables.tf +++ b/modules/regional-go-service/variables.tf @@ -193,7 +193,7 @@ variable "squad" { variable "otel_collector_image" { type = string - default = "chainguard/opentelemetry-collector-contrib:latest" + default = "chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf" description = "The otel collector image to use as a base. Must be on gcr.io or dockerhub." } diff --git a/modules/regional-service/README.md b/modules/regional-service/README.md index d4e0015b..fa812914 100644 --- a/modules/regional-service/README.md +++ b/modules/regional-service/README.md @@ -92,7 +92,7 @@ No modules. | [labels](#input\_labels) | Labels to apply to the service. | `map(string)` | `{}` | no | | [name](#input\_name) | n/a | `string` | n/a | yes | | [notification\_channels](#input\_notification\_channels) | List of notification channels to alert. | `list(string)` | n/a | yes | -| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib:latest"` | no | +| [otel\_collector\_image](#input\_otel\_collector\_image) | The otel collector image to use as a base. Must be on gcr.io or dockerhub. | `string` | `"chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf"` | no | | [project\_id](#input\_project\_id) | n/a | `string` | n/a | yes | | [regional-volumes](#input\_regional-volumes) | The volumes to make available to the containers in the service for mounting. | 
list(object({
    name = string
    gcs = optional(map(object({
      bucket    = string
      read_only = optional(bool, true)
    })), {})
    nfs = optional(map(object({
      server    = string
      path      = string
      read_only = optional(bool, true)
    })), {})
  }))
| `[]` | no | | [regions](#input\_regions) | A map from region names to a network and subnetwork. A service will be created in each region configured to egress the specified traffic via the specified subnetwork. | 
map(object({
    network = string
    subnet  = string
  }))
| n/a | yes | diff --git a/modules/regional-service/variables.tf b/modules/regional-service/variables.tf index 589ddf94..577ec1c1 100644 --- a/modules/regional-service/variables.tf +++ b/modules/regional-service/variables.tf @@ -188,7 +188,7 @@ variable "squad" { variable "otel_collector_image" { type = string - default = "chainguard/opentelemetry-collector-contrib:latest" + default = "chainguard/opentelemetry-collector-contrib@sha256:6c1e188e3c77c0e842401c0a88ef32c30c7a6895ef212fe614f714109006f0cf" description = "The otel collector image to use as a base. Must be on gcr.io or dockerhub." }