Update OpenTelemetryCollector CR to v1beta1 (#9)

* Update OpenTelemetryCollector CR to v1beta1

* Update OpenTelemetryCollector CR to v1beta1

Author: avillela

src/resources/02-otel-collector-ls.yml

@@ -1,4 +1,4 @@
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otelcol
@@ -10,35 +10,32 @@ spec:
     serviceAccount: opentelemetry-targetallocator-sa
     prometheusCR:
       enabled: true
+      podMonitorSelector: {}
+      serviceMonitorSelector: {}
       ## If uncommented, only service monitors with this label will get picked up
-      # serviceMonitorSelector:
       #   app: my-app
   env:
     - name: LS_TOKEN
       valueFrom:
         secretKeyRef:
           key: LS_TOKEN
           name: otel-collector-secret
-  config: |
+  config:
     receivers:
       otlp:
         protocols:
-          grpc:
-          http:
+          grpc: {}
+          http: {}
       prometheus:
         config:
           scrape_configs:
-          - job_name: 'otel-collector'
-            scrape_interval: 30s
-            static_configs:
-            - targets: [ '0.0.0.0:8888' ]
-        target_allocator:
-          endpoint: http://otelcol-targetallocator.opentelemetry.svc.cluster.local
-          interval: 30s
-          collector_id: "${POD_NAME}"
+            - job_name: 'otel-collector'
+              scrape_interval: 10s
+              static_configs:
+              - targets: [ '0.0.0.0:8888' ]
 
     processors:
-      batch:
+      batch: {}
 
     exporters:
       otlp/ls:

src/resources/02-otel-collector.yml

@@ -1,39 +1,38 @@
 # API reference https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md
-apiVersion: opentelemetry.io/v1alpha1
+# Refs for v1beta1 config: https://github.com/open-telemetry/opentelemetry-operator/issues/3011#issuecomment-2154118998
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otelcol
   namespace: opentelemetry
 spec:
   mode: statefulset
+  image: otel/opentelemetry-collector-contrib:0.102.1
   targetAllocator:
     enabled: true
     serviceAccount: opentelemetry-targetallocator-sa
     prometheusCR:
       enabled: true
+      podMonitorSelector: {}
+      serviceMonitorSelector: {}
       ## If uncommented, only service monitors with this label will get picked up
-      # serviceMonitorSelector:
       #   app: my-app
-  config: |
+  config:
     receivers:
       otlp:
         protocols:
-          grpc:
-          http:
+          grpc: {}
+          http: {}
       prometheus:
         config:
           scrape_configs:
-          - job_name: 'otel-collector'
-            scrape_interval: 30s
-            static_configs:
-            - targets: [ '0.0.0.0:8888' ]
-        target_allocator:
-          endpoint: http://otelcol-targetallocator.opentelemetry.svc.cluster.local
-          interval: 30s
-          collector_id: "${POD_NAME}"
+            - job_name: 'otel-collector'
+              scrape_interval: 10s
+              static_configs:
+              - targets: [ '0.0.0.0:8888' ]
 
     processors:
-      batch:
+      batch: {}
 
     exporters:
       logging:

src/scripts/02-k8s-setup.sh

@@ -2,8 +2,8 @@
 
 # Install just ServiceMonitor and PodMonitor
 # NOTE: This GH issue put me on the right track: https://github.com/open-telemetry/opentelemetry-operator/issues/1811#issuecomment-1584128371
-kubectl --context kind-otel-target-allocator-talk apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
-kubectl --context kind-otel-target-allocator-talk apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl --context kind-otel-target-allocator-talk apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl --context kind-otel-target-allocator-talk apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
 
 # Install cert-manager, since it's a dependency of the OTel Operator
 kubectl --context kind-otel-target-allocator-talk apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.3/cert-manager.yaml
@@ -14,4 +14,4 @@ echo "Taking a 90-second nap while the cert-manager pods come up..."
 sleep 90
 
 # Install operator
-kubectl --context kind-otel-target-allocator-talk apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.99.0/opentelemetry-operator.yaml
+kubectl --context kind-otel-target-allocator-talk apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.102.0/opentelemetry-operator.yaml