From c1ac1df2bf06cc84265ab6df99bbf37fd313338c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Wed, 3 Mar 2021 14:53:08 +0100
Subject: [PATCH] Add doc and e2e for sidecar (#217)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
---
 README.md                                   | 93 ++++++++++++++++++++-
 tests/e2e/smoke-sidecar/00-install.yaml     | 22 +++++
 tests/e2e/smoke-sidecar/01-assert.yaml      | 13 +++
 tests/e2e/smoke-sidecar/01-install-app.yaml | 19 +++++
 tests/e2e/smoke-simplest/00-assert.yaml     |  2 +-
 5 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 tests/e2e/smoke-sidecar/00-install.yaml
 create mode 100644 tests/e2e/smoke-sidecar/01-assert.yaml
 create mode 100644 tests/e2e/smoke-sidecar/01-install-app.yaml

diff --git a/README.md b/README.md
index f18eecba14..5fadfa33bf 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,6 @@ spec:
         protocols:
           grpc:
     processors:
-      queued_retry:
 
     exporters:
       logging:
@@ -38,10 +37,11 @@ spec:
       pipelines:
         traces:
           receivers: [jaeger]
-          processors: [queued_retry]
+          processors: []
           exporters: [logging]
 EOF
 ```
+
 **_WARNING:_** Until the OpenTelemetry Collector format is stable, changes may be required in the above example to remain
 compatible with the latest version of the OpenTelemetry Collector image being referenced.
 
@@ -53,7 +53,94 @@ At this point, the Operator does *not* validate the contents of the configuratio
 
 ### Deployment modes
 
-The `CustomResource` for the `OpenTelemetryCollector` exposes a property named `.Spec.Mode`, which can be used to specify whether the collector should run as a `DaemonSet` or as a `Deployment` (default). Look at the `examples/daemonset.yaml` for reference.
+The `CustomResource` for the `OpenTelemetryCollector` exposes a property named `.Spec.Mode`, which can be used to specify whether the collector should run as a `DaemonSet`, `Sidecar`, or `Deployment` (default). Look at the `examples/daemonset.yaml` for reference.
+
+#### Sidecar injection
+
+A sidecar with the OpenTelemetry Collector can be injected into pod-based workloads by setting the pod annotation `sidecar.opentelemetry.io/inject` to either `"true"`, or to the name of a concrete `OpenTelemetryCollector` from the same namespace, like in the following example:
+
+```console
+$ kubectl apply -f - <<EOF
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+  name: sidecar-for-my-app
+spec:
+  mode: sidecar
+  config: |
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+    processors:
+
+    exporters:
+      logging:
+
+    service:
+      pipelines:
+        traces:
+          receivers: [jaeger]
+          processors: []
+          exporters: [logging]
+EOF
+
+$ kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: myapp
+  annotations:
+    sidecar.opentelemetry.io/inject: "true"
+spec:
+  containers:
+  - name: myapp
+    image: jaegertracing/vertx-create-span:operator-e2e-tests
+    ports:
+      - containerPort: 8080
+        protocol: TCP
+EOF
+```
+
+When there are multiple `OpenTelemetryCollector` resources with a mode set to `Sidecar` in the same namespace, a concrete name should be used. When there's only one `Sidecar` instance in the same namespace, this instance is used when the annotation is set to `"true"`.
+
+The annotation value can come either from the namespace, or from the pod. The most specific annotation wins, in this order:
+
+* the pod annotation is used when it's set to a concrete instance name or to `"false"`
+* namespace annotation is used when the pod annotation is either absent or set to `"true"`, and the namespace is set to a concrete instance or to `"false"`
+
+When using a pod-based workload, such as `Deployment` or `Statefulset`, make sure to add the annotation to the `PodTemplate` part. Like:
+
+```console
+$ kubectl apply -f - <<EOF
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-app
+  labels:
+    app: my-app
+  annotations:
+    sidecar.opentelemetry.io/inject: "true" # WRONG
+spec:
+  selector:
+    matchLabels:
+      app: my-app
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: my-app
+      annotations:
+        sidecar.opentelemetry.io/inject: "true" # CORRECT
+    spec:
+      containers:
+      - name: myapp
+        image: jaegertracing/vertx-create-span:operator-e2e-tests
+        ports:
+          - containerPort: 8080
+            protocol: TCP
+EOF
+```
 
 ## Contributing and Developing
 
diff --git a/tests/e2e/smoke-sidecar/00-install.yaml b/tests/e2e/smoke-sidecar/00-install.yaml
new file mode 100644
index 0000000000..1d498c6268
--- /dev/null
+++ b/tests/e2e/smoke-sidecar/00-install.yaml
@@ -0,0 +1,22 @@
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+  name: sidecar-for-my-app
+spec:
+  mode: sidecar
+  config: |
+    receivers:
+      jaeger:
+        protocols:
+          grpc:
+    processors:
+
+    exporters:
+      logging:
+
+    service:
+      pipelines:
+        traces:
+          receivers: [jaeger]
+          processors: []
+          exporters: [logging]
diff --git a/tests/e2e/smoke-sidecar/01-assert.yaml b/tests/e2e/smoke-sidecar/01-assert.yaml
new file mode 100644
index 0000000000..40a7b819bc
--- /dev/null
+++ b/tests/e2e/smoke-sidecar/01-assert.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    sidecar.opentelemetry.io/inject: "true"
+  labels:
+    app: my-pod-with-sidecar
+spec:
+  containers:
+  - name: myapp
+  - name: otc-container
+status:
+  phase: Running
diff --git a/tests/e2e/smoke-sidecar/01-install-app.yaml b/tests/e2e/smoke-sidecar/01-install-app.yaml
new file mode 100644
index 0000000000..8a7396ef6d
--- /dev/null
+++ b/tests/e2e/smoke-sidecar/01-install-app.yaml
@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-deployment-with-sidecar
+spec:
+  selector:
+    matchLabels:
+      app: my-pod-with-sidecar
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: my-pod-with-sidecar
+      annotations:
+        sidecar.opentelemetry.io/inject: "true"
+    spec:
+      containers:
+      - name: myapp
+        image: k8s.gcr.io/echoserver:1.4
diff --git a/tests/e2e/smoke-simplest/00-assert.yaml b/tests/e2e/smoke-simplest/00-assert.yaml
index 507217d9cb..63f327e5e4 100644
--- a/tests/e2e/smoke-simplest/00-assert.yaml
+++ b/tests/e2e/smoke-simplest/00-assert.yaml
@@ -3,4 +3,4 @@ kind: Deployment
 metadata:
   name: simplest-collector
 status:
-  readyReplicas: 1
\ No newline at end of file
+  readyReplicas: 1