From 45af5dbccb34bafa8f54e2fdd242b6bb5f9ceb4f Mon Sep 17 00:00:00 2001 From: Fabrice Scellos Date: Thu, 7 Apr 2022 17:55:58 +0200 Subject: [PATCH] Change back kustomization.yaml change by e2e test and documentation that mustn't be updated --- README.md | 40 +++---------------------------- config/manager/kustomization.yaml | 8 +------ 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index d283927962..bc071e612f 100644 --- a/README.md +++ b/README.md @@ -215,40 +215,6 @@ The possible values for the annotation can be * `"my-instrumentation"` - name of `Instrumentation` CR instance. * `"false"` - do not inject -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. - #### Use customized or vendor instrumentation By default, the operator uses upstream auto-instrumentation libraries. Custom auto-instrumentation can be configured by @@ -292,6 +258,8 @@ The OpenTelemetry Operator *might* work on versions outside of the given range, | OpenTelemetry Operator | Kubernetes | Cert-Manager | |------------------------|----------------------|----------------------| +| v0.48.0 | v1.19 to v1.23 | 1.6.1 | +| v0.47.0 | v1.19 to v1.23 | 1.6.1 | | v0.46.0 | v1.19 to v1.23 | 1.6.1 | | v0.45.0 | v1.21 to v1.23 | 1.6.1 | | v0.44.0 | v1.21 to v1.23 | 1.6.1 | @@ -310,8 +278,6 @@ The OpenTelemetry Operator *might* work on versions outside of the given range, | v0.33.0 | v1.20 to v1.22 | v1.4.0 to v1.5.4 | | v0.32.0 (skipped) | n/a | n/a | | v0.31.0 | v1.19 to v1.21 | v1.4.0 to v1.5.4 | -| v0.30.0 | v1.19 to v1.21 | v1.4.0 to v1.5.4 | -| v0.29.0 | v1.19 to v1.21 | v1.4.0 to v1.5.4 | ## Contributing and Developing @@ -358,4 +324,4 @@ Thanks to all the people who already contributed! [godoc-img]: https://godoc.org/github.com/open-telemetry/opentelemetry-operator?status.svg [godoc]: https://godoc.org/github.com/open-telemetry/opentelemetry-operator/pkg/apis/opentelemetry/v1alpha1#OpenTelemetryCollector [contributors]: https://github.com/open-telemetry/opentelemetry-operator/graphs/contributors -[contributors-img]: https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-operator +[contributors-img]: https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-operator \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 46c1861f30..bffbe8a58a 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,8 +1,2 @@ resources: -- manager.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -images: -- name: controller - newName: local/opentelemetry-operator - newTag: e2e + - manager.yaml \ No newline at end of file