Integration du choix du conteneur par annotation

Merge + taken into account of remarks for PR 689 to support multiple
containers injection instead of one + adding some integration tests

IT Test correction

Documentation correction's suggestion of  @pavolloffay

Correction IT test

Creation of simple method to calculate if injection of init containers
(and volume) had already be done

Add copyright information

Add copyright information

Add copyright information

Correction of the two linters problem (licence header missing on unit
test and .dot not present at the end of one comment (sig..)

Change back kustomization.yaml change by e2e test and documentation that
mustn't be updated

README.md

@@ -215,6 +215,46 @@ The possible values for the annotation can be
 * `"my-instrumentation"` - name of `Instrumentation` CR instance.
 * `"false"` - do not inject
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+Use the following annotation on Pod template to specify container names for auto-instrumentation injection :
+
+```bash
+instrumentation.opentelemetry.io/container-names: "name_of_your_target_container"
+```
+
+Mutliple container names can be specified :
+
+```bash
+instrumentation.opentelemetry.io/container-names: "application,sidecar"
+```
+
+#### Use customized or vendor instrumentation
+
+By default, the operator uses upstream auto-instrumentation libraries. Custom auto-instrumentation can be configured by
+overriding the image fields in a CR.
+
+```yaml
+apiVersion: opentelemetry.io/v1alpha1
+kind: Instrumentation
+metadata:
+  name: my-instrumentation
+spec:
+  java:
+    image: your-customized-auto-instrumentation-image:java
+  nodejs:
+    image: your-customized-auto-instrumentation-image:nodejs
+  python:
+    image: your-customized-auto-instrumentation-image:python
+```
+
+The Dockerfiles for auto-instrumentation can be found in [autoinstrumentation directory](./autoinstrumentation). 
+Follow the instructions in the Dockerfiles on how to build a custom container image.
+
+>>>>>>> f43e468 (Documentation correction's suggestion of  @pavolloffay)
+=======
+>>>>>>> 45af5db (Change back kustomization.yaml change by e2e test and documentation that)
 #### Use customized or vendor instrumentation
 
 By default, the operator uses upstream auto-instrumentation libraries. Custom auto-instrumentation can be configured by