Update OpenTelemetry Collector

examples/features/jaeger/README.md

@@ -65,7 +65,11 @@ e.g. the following forwards `http://localhost:16686` to the Jaeger UI:
 kubectl port-forward svc/simplest-query -n observability 16686:16686
 ```
 
-## How to use
+## Requires
+
+- [spire](../../spire)
+
+## Run
 
 Create namespace observability:
 ```bash
@@ -82,7 +86,7 @@ Wait for Jaeger Operator pod status ready:
 kubectl wait -n observability --timeout=1m --for=condition=ready pod -l name=jaeger-operator
 ```
 
-Apply Jaeger pod:
+Apply Jaeger and OpenTelemetry Collector:
 ```bash
 kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/jaeger/jaeger?ref=3d1dcfe1de90681213c7f0006f25279bb4699966
 ```
@@ -92,27 +96,10 @@ Wait for Jaeger pod status ready:
 kubectl wait -n observability --timeout=1m --for=condition=ready pod -l app=jaeger
 ```
 
-Apply OpenTelemetry pod:
-```bash
-kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/jaeger/opentelemetry?ref=3d1dcfe1de90681213c7f0006f25279bb4699966
-```
-
-Apply Spire deployments (required for NSM system)
-```bash
-kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/spire?ref=3d1dcfe1de90681213c7f0006f25279bb4699966
-```
-
-Wait for Spire pods status ready:
-```bash
-kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent
-```
-```bash
-kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server
-```
 
-Create namespace nsm-system:
+Wait for Opentelemetry pods status ready:
 ```bash
-kubectl create ns nsm-system
+kubectl wait -n observability --timeout=1m --for=condition=ready pod -l app=opentelemetry
 ```
 
 Apply NSM resources:
@@ -150,9 +137,3 @@ Delete observability namespace:
 ```bash
 kubectl delete ns observability
 ```
-
-Delete Spire:
-```bash
-kubectl delete crd spiffeids.spiffeid.spiffe.io
-kubectl delete ns spire
-```

examples/features/jaeger/jaeger/kustomization.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: observability
+
+resources:
+- jaeger.yaml

examples/features/jaeger/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: observability
+
+bases:
+  - jaeger
+  - opentelemetry

examples/features/jaeger/nsm-system/kustomization.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+resources:
+  - namespace.yaml
+bases:
+  - https://github.com/networkservicemesh/deployments-k8s/examples/memory?ref=6cb851e2075646d8476d01f4f881a9a27b80f507
+
+patchesStrategicMerge:
+  - patch-nsmgr.yaml
+  - patch-forwarder.yaml

examples/features/jaeger/nsm-system/namespace.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: nsm-system

examples/features/jaeger/opentelemetry/kustomization.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: observability
+
+resources:
+- otel-collector.yaml

examples/features/jaeger/opentelemetry/otel-collector.yaml

@@ -19,7 +19,8 @@ data:
     exporters:
       jaeger:
         endpoint: "simplest-collector.observability.svc.cluster.local:14250"
-        insecure: true
+        tls:
+          insecure: true
       logging:
     service:
       extensions: [health_check]
@@ -81,7 +82,7 @@ spec:
         - command:
             - "/otelcol"
             - "--config=/conf/otel-collector-config.yaml"
-          image: otel/opentelemetry-collector:0.35.0
+          image: otel/opentelemetry-collector:0.56.0
           name: otel-collector
           ports:
             - containerPort: 14250  # Default endpoint for Jaeger gRPC receiver.

examples/observability/jaeger-and-prometheus/jaeger/kustomization.yaml

@@ -2,5 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: nsm-system
+
 resources:
 - jaeger.yaml

examples/observability/jaeger-and-prometheus/nsm-system/kustomization.yaml

@@ -4,8 +4,11 @@ kind: Kustomization
 
 namespace: nsm-system
 
+resources:
+  - namespace.yaml
+
 bases:
-  - ../../../memory
+  - https://github.com/networkservicemesh/deployments-k8s/examples/memory?ref=6cb851e2075646d8476d01f4f881a9a27b80f507
 
 patchesStrategicMerge:
   - patch-nsmgr.yaml

examples/observability/jaeger-and-prometheus/opentelemetry/otel-collector.yaml

@@ -18,8 +18,9 @@ data:
       health_check: {}
     exporters:
       jaeger:
-        endpoint: "jaeger:14250"
-        insecure: true
+        endpoint: jaeger:14250
+        tls:
+          insecure: true
       prometheus:
         endpoint: "0.0.0.0:8889"
     service:
@@ -82,7 +83,7 @@ spec:
         - command:
             - "/otelcol"
             - "--config=/conf/otel-collector-config.yaml"
-          image: otel/opentelemetry-collector:0.35.0
+          image: otel/opentelemetry-collector:0.56.0
           name: otel-collector
           ports:
             - containerPort: 14250  # Default endpoint for Jaeger gRPC receiver.

external-images.yaml

@@ -16,6 +16,6 @@ images:
   - docker.io/travelping/nettools:1.10.1
   - k8s.gcr.io/e2e-test-images/jessie-dnsutils:1.3
   - jaegertracing/all-in-one:1.36
-  - otel/opentelemetry-collector:0.35.0
+  - otel/opentelemetry-collector:0.56.0
   - prom/prometheus:v2.37.0
   - networkstatic/iperf3:latest