From e004efd84e85561372b8b95702fa70769c67df23 Mon Sep 17 00:00:00 2001
From: Matt Moore <mattmoor@chainguard.dev>
Date: Fri, 29 Sep 2023 14:01:30 -0400
Subject: [PATCH] Pin the opentelemetry chart

Signed-off-by: Matt Moore <mattmoor@chainguard.dev>
---
 .../tests/custom-config.yaml                  | 28 ++++++++-----------
 .../tests/main.tf                             |  4 +++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/images/opentelemetry-collector-contrib/tests/custom-config.yaml b/images/opentelemetry-collector-contrib/tests/custom-config.yaml
index f9f95dabea..14704c9c16 100644
--- a/images/opentelemetry-collector-contrib/tests/custom-config.yaml
+++ b/images/opentelemetry-collector-contrib/tests/custom-config.yaml
@@ -51,11 +51,6 @@ exporters:
     endpoint: "http://zipkin-all-in-one:9411/api/v2/spans"
     format: proto
 
-  jaeger:
-    endpoint: jaeger-all-in-one:14250
-    tls:
-      insecure: true
-
   # datadog:
   #   api:
   #     site: us5.datadoghq.com
@@ -68,7 +63,7 @@ processors:
     timeout: 10s
   resourcedetection:
     # These warn when not applicable, so just include everything
-    detectors: 
+    detectors:
       - env
       - eks
       - ec2
@@ -89,46 +84,45 @@ extensions:
     size_in_percentage: 5
 
 service:
-  extensions: 
+  extensions:
     - pprof
     - zpages
     - health_check
     - memory_ballast
   pipelines:
     metrics:
-      receivers: 
+      receivers:
         - otlp
         - hostmetrics
-      processors: 
+      processors:
         - resourcedetection
         - k8sattributes
         - batch
-      exporters: 
+      exporters:
         - logging
         - prometheus
         # - datadog
 
     traces:
-      receivers: 
+      receivers:
         - otlp
-      processors: 
+      processors:
         - resourcedetection
         - k8sattributes
         - batch
-      exporters: 
+      exporters:
         - logging
         - zipkin # fails (with warning) without zipkin deployed
-        - jaeger # fails (with warning) without jaeger deployed
         # - datadog
 
     logs:
-      receivers: 
+      receivers:
         - filelog
-      processors: 
+      processors:
         - resourcedetection
         - k8sattributes
         - batch
-      exporters: 
+      exporters:
         - logging
         # - datadog
 
diff --git a/images/opentelemetry-collector-contrib/tests/main.tf b/images/opentelemetry-collector-contrib/tests/main.tf
index 4d2ca6413e..3f0eb736a9 100644
--- a/images/opentelemetry-collector-contrib/tests/main.tf
+++ b/images/opentelemetry-collector-contrib/tests/main.tf
@@ -20,6 +20,10 @@ resource "helm_release" "open-telemetry-deploy" {
   namespace        = "otelc-deploy"
   create_namespace = true
 
+  // After https://github.com/open-telemetry/opentelemetry-helm-charts/pull/892 we
+  // fail to install because of unrecognized exporters.
+  version = "0.69.0"
+
   values = [jsonencode({
     mode = "deployment"
     image = {