Skip to content

Commit 75eb188

Browse files
author
Israel Blancas
authored
Merge branch 'main' into 3155-2
2 parents 3d9ff71 + 49ca805 commit 75eb188

30 files changed

+2323
-271
lines changed

.chloggen/1814-java-configmap.yaml

-19
This file was deleted.

.chloggen/3267-custom-instr-vol.yaml

-16
This file was deleted.

.chloggen/3305-persistentVolumeClaimRetentionPolicy.yaml

-16
This file was deleted.

.chloggen/3380-ta-serviceaccount-check.yaml

-16
This file was deleted.

.chloggen/3384-build-musl-python-autoinstrumentation.yaml

-16
This file was deleted.

.chloggen/httpd_safe_conf.yaml

-16
This file was deleted.

.chloggen/kubeletstats.yaml

-16
This file was deleted.

.chloggen/nodejs-ibm-platforms.yaml

-16
This file was deleted.

.chloggen/ta-no-root.yaml

-16
This file was deleted.

.github/workflows/e2e.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
- group: e2e-native-sidecar
5050
setup: "add-operator-arg OPERATOR_ARG='--feature-gates=operator.sidecarcontainers.native' prepare-e2e"
5151
kube-version: "1.29"
52+
- group: e2e-targetallocator
53+
setup: "enable-targetallocator-cr prepare-e2e"
5254
steps:
5355
- name: Check out code into the Go module directory
5456
uses: actions/checkout@v4

CHANGELOG.md

+33
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22

33
<!-- next version -->
44

5+
## 0.112.0
6+
7+
### 💡 Enhancements 💡
8+
9+
- `auto-instrumentation`: Support configuring Java auto-instrumentation when runtime configuration is provided from configmap or secret. (#1814)
10+
This change allows users to configure JAVA_TOOL_OPTIONS in config map or secret when the name of the variable is defined in the pod spec.
11+
The operator in this case set another JAVA_TOOL_OPTIONS that references the original value
12+
e.g. `JAVA_TOOL_OPTIONS=$(JAVA_TOOL_OPTIONS) -javaagent:/otel-auto-instrumentation-java/javaagent.jar`.
13+
14+
- `auto-instrumentation`: Adds VolumeClaimTemplate field to Instrumentation spec to enable user-definable ephemeral volumes for auto-instrumentation. (#3267)
15+
- `collector`: Add support for persistentVolumeClaimRetentionPolicy field (#3305)
16+
- `auto-instrumentation`: build musl based auto-instrumentation in Python docker image (#2264)
17+
- `auto-instrumentation`: An empty line should come before the addition of Include ...opentemetry_agent.conf, as a protection measure against cases of httpd.conf w/o a blank last line (#3401)
18+
- `collector`: Add automatic RBAC creation for the `kubeletstats` receiver. (#3155)
19+
- `auto-instrumentation`: Add Nodejs auto-instrumentation image builds for linux/s390x,linux/ppc64le. (#3322)
20+
21+
### 🧰 Bug fixes 🧰
22+
23+
- `target allocator`: Permission check fixed for the serviceaccount of the target allocator (#3380)
24+
- `target allocator`: Change docker image to run as non-root (#3378)
25+
26+
### Components
27+
28+
* [OpenTelemetry Collector - v0.112.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.112.0)
29+
* [OpenTelemetry Contrib - v0.112.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.112.0)
30+
* [Java auto-instrumentation - v1.33.5](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5)
31+
* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
32+
* [Node.JS - v0.53.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.53.0)
33+
* [Python - v0.48b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.48b0)
34+
* [Go - v0.15.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.15.0-alpha)
35+
* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
36+
* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
37+
538
## 0.111.0
639

740
### 💡 Enhancements 💡

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ add-rbac-permissions-to-operator: manifests kustomize
213213
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/rbac.yaml
214214
cd config/rbac && $(KUSTOMIZE) edit add patch --kind ClusterRole --name manager-role --path extra-permissions-operator/replicaset.yaml
215215

216+
.PHONY: enable-targetallocator-cr
217+
enable-targetallocator-cr:
218+
@$(MAKE) add-operator-arg OPERATOR_ARG='--feature-gates=operator.collector.targetallocatorcr'
219+
cd config/crd && $(KUSTOMIZE) edit add resource bases/opentelemetry.io_targetallocators.yaml
220+
216221
# Deploy controller in the current Kubernetes context, configured in ~/.kube/config
217222
.PHONY: deploy
218223
deploy: set-image-controller

RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
4444

4545
| Version | Release manager |
4646
|----------|-----------------|
47-
| v0.112.0 | @yuriolisa |
4847
| v0.113.0 | @pavolloffay |
4948
| v0.114.0 | @TylerHelmuth |
5049
| v0.115.0 | @jaronoff97 |
5150
| v0.116.0 | @swiatekm |
5251
| v0.117.0 | @iblancasa |
5352
| v0.118.0 | @frzifus |
53+
| v0.119.0 | @yuriolisa |

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-10-16T10:10:50Z"
102+
createdAt: "2024-10-30T17:23:26Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
106106
repository: github.com/open-telemetry/opentelemetry-operator
107107
support: OpenTelemetry Community
108-
name: opentelemetry-operator.v0.111.0
108+
name: opentelemetry-operator.v0.112.0
109109
namespace: placeholder
110110
spec:
111111
apiservicedefinitions: {}
@@ -389,6 +389,7 @@ spec:
389389
- opentelemetry.io
390390
resources:
391391
- opampbridges
392+
- targetallocators
392393
verbs:
393394
- create
394395
- delete
@@ -409,6 +410,7 @@ spec:
409410
- opampbridges/status
410411
- opentelemetrycollectors/finalizers
411412
- opentelemetrycollectors/status
413+
- targetallocators/status
412414
verbs:
413415
- get
414416
- patch
@@ -481,7 +483,7 @@ spec:
481483
valueFrom:
482484
fieldRef:
483485
fieldPath: spec.serviceAccountName
484-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.111.0
486+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.112.0
485487
livenessProbe:
486488
httpGet:
487489
path: /healthz
@@ -589,7 +591,7 @@ spec:
589591
minKubeVersion: 1.23.0
590592
provider:
591593
name: OpenTelemetry Community
592-
version: 0.111.0
594+
version: 0.112.0
593595
webhookdefinitions:
594596
- admissionReviewVersions:
595597
- v1alpha1

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-10-16T10:10:50Z"
102+
createdAt: "2024-10-30T17:23:26Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
106106
repository: github.com/open-telemetry/opentelemetry-operator
107107
support: OpenTelemetry Community
108-
name: opentelemetry-operator.v0.111.0
108+
name: opentelemetry-operator.v0.112.0
109109
namespace: placeholder
110110
spec:
111111
apiservicedefinitions: {}
@@ -389,6 +389,7 @@ spec:
389389
- opentelemetry.io
390390
resources:
391391
- opampbridges
392+
- targetallocators
392393
verbs:
393394
- create
394395
- delete
@@ -409,6 +410,7 @@ spec:
409410
- opampbridges/status
410411
- opentelemetrycollectors/finalizers
411412
- opentelemetrycollectors/status
413+
- targetallocators/status
412414
verbs:
413415
- get
414416
- patch
@@ -485,7 +487,7 @@ spec:
485487
valueFrom:
486488
fieldRef:
487489
fieldPath: spec.serviceAccountName
488-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.111.0
490+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.112.0
489491
livenessProbe:
490492
httpGet:
491493
path: /healthz
@@ -593,7 +595,7 @@ spec:
593595
minKubeVersion: 1.23.0
594596
provider:
595597
name: OpenTelemetry Community
596-
version: 0.111.0
598+
version: 0.112.0
597599
webhookdefinitions:
598600
- admissionReviewVersions:
599601
- v1alpha1

config/rbac/role.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ rules:
135135
- opentelemetry.io
136136
resources:
137137
- opampbridges
138+
- targetallocators
138139
verbs:
139140
- create
140141
- delete
@@ -155,6 +156,7 @@ rules:
155156
- opampbridges/status
156157
- opentelemetrycollectors/finalizers
157158
- opentelemetrycollectors/status
159+
- targetallocators/status
158160
verbs:
159161
- get
160162
- patch

0 commit comments

Comments
 (0)