Skip to content

Commit 2abc8c2

Browse files
IshwarKanseIshwarKanse
authored
Merge branch 'main' into fix-inst
2 parents 44858fc + 0a4182b commit 2abc8c2

12 files changed

+61
-96
lines changed

‎.chloggen/annotations-filter.yaml

-16
This file was deleted.

‎.chloggen/dotnet-instrumentation-command-flag.yaml

-16
This file was deleted.

‎.chloggen/target-allocator-respect-endpointslice.yaml

-16
This file was deleted.

‎.chloggen/webhook-remove-pod-update.yaml

-16
This file was deleted.

‎.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
path: bin
5555
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
5656
- name: Install chainsaw
57-
uses: kyverno/[email protected].7
57+
uses: kyverno/[email protected].8
5858
- name: Install tools
5959
run: make install-tools
6060
- name: Prepare e2e tests

‎CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@ Changes by Version
22
==================
33
<!-- next version -->
44

5+
## 0.96.0
6+
7+
### 🛑 Breaking changes 🛑
8+
9+
- `operator`: change dotnet instrumentation feature gate into command line flag --enable-dotnet-instrumentation (#2582, #2671)
10+
11+
### 💡 Enhancements 💡
12+
13+
- `operator`: Created ability to filter out Annotations (#2627)
14+
15+
### 🧰 Bug fixes 🧰
16+
17+
- `target allocator`: Fix per-node target allocation for targets from endpointslices (#2718)
18+
The per-node target allocation strategy was not matching endpointslice entries for with a `kind` of Node, such as those for the kubelet metrics created by the prometheus operator
19+
- `operator`: Removes UPDATE from pod mutating admission webhook since it only needs to mutate on pod CREATE events. (#1514)
20+
The pod webhook currently modifies the pod spec in invalid ways on UPDATE events, and UPDATES are not necessary in the webhook.
21+
22+
### Components
23+
24+
* [OpenTelemetry Collector - v0.96.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.96.0)
25+
* [OpenTelemetry Contrib - v0.96.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.96.0)
26+
* [Java auto-instrumentation - v1.32.1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.1)
27+
* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/{AUTO_INSTRUMENTATION_DOTNET_VERSION})
28+
* [Node.JS - v0.46.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.46.0)
29+
* [Python - v0.44b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.44b0)
30+
* [Go - v0.10.1-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.10.1-alpha)
31+
* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
32+
* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
33+
534
## 0.95.0
635

736
### 🛑 Breaking changes 🛑

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
710710

711711
| OpenTelemetry Operator | Kubernetes | Cert-Manager |
712712
|------------------------|----------------------|---------------------|
713+
| v0.96.0 | v1.23 to v1.29 | v1 |
713714
| v0.95.0 | v1.23 to v1.29 | v1 |
714715
| v0.94.0 | v1.23 to v1.29 | v1 |
715716
| v0.93.0 | v1.23 to v1.29 | v1 |
@@ -732,7 +733,6 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
732733
| v0.76.1 | v1.19 to v1.26 | v1 |
733734
| v0.75.0 | v1.19 to v1.26 | v1 |
734735
| v0.74.0 | v1.19 to v1.26 | v1 |
735-
| v0.73.0 | v1.19 to v1.26 | v1 |
736736

737737
## Contributing and Developing
738738

‎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.96.0 | @frzifus |
4847
| v0.97.0 | @jaronoff97 |
4948
| v0.98.0 | @yuriolisa |
5049
| v0.99.0 | @pavolloffay |
5150
| v0.100.0 | @VineethReddy02 |
5251
| v0.101.0 | @TylerHelmuth |
5352
| v0.102.0 | @swiatekm-sumo |
53+
| v0.103.0 | @frzifus |

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ metadata:
6565
categories: Logging & Tracing,Monitoring
6666
certified: "false"
6767
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
68-
createdAt: "2024-03-04T14:38:01Z"
68+
createdAt: "2024-03-08T17:10:13Z"
6969
description: Provides the OpenTelemetry components, including the Collector
7070
operators.operatorframework.io/builder: operator-sdk-v1.29.0
7171
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
7272
repository: github.com/open-telemetry/opentelemetry-operator
7373
support: OpenTelemetry Community
74-
name: opentelemetry-operator.v0.95.0
74+
name: opentelemetry-operator.v0.96.0
7575
namespace: placeholder
7676
spec:
7777
apiservicedefinitions: {}
@@ -404,7 +404,7 @@ spec:
404404
- --zap-log-level=info
405405
- --zap-time-encoding=rfc3339nano
406406
- --feature-gates=+operator.autoinstrumentation.go,+operator.autoinstrumentation.nginx
407-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.95.0
407+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.96.0
408408
livenessProbe:
409409
httpGet:
410410
path: /healthz
@@ -512,7 +512,7 @@ spec:
512512
minKubeVersion: 1.23.0
513513
provider:
514514
name: OpenTelemetry Community
515-
version: 0.95.0
515+
version: 0.96.0
516516
webhookdefinitions:
517517
- admissionReviewVersions:
518518
- v1

‎go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2
2525
github.com/prometheus-operator/prometheus-operator/pkg/client v0.71.2
2626
github.com/prometheus/client_golang v1.19.0
27-
github.com/prometheus/common v0.49.0
27+
github.com/prometheus/common v0.50.0
2828
github.com/prometheus/prometheus v0.50.1
2929
github.com/shirou/gopsutil v3.21.11+incompatible
3030
github.com/spf13/pflag v1.0.5
@@ -196,14 +196,14 @@ require (
196196
go.uber.org/goleak v1.3.0 // indirect
197197
go.uber.org/zap v1.26.0 // indirect
198198
golang.org/x/arch v0.3.0 // indirect
199-
golang.org/x/crypto v0.19.0 // indirect
199+
golang.org/x/crypto v0.21.0 // indirect
200200
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
201201
golang.org/x/mod v0.14.0 // indirect
202-
golang.org/x/net v0.21.0 // indirect
203-
golang.org/x/oauth2 v0.17.0 // indirect
202+
golang.org/x/net v0.22.0 // indirect
203+
golang.org/x/oauth2 v0.18.0 // indirect
204204
golang.org/x/sync v0.6.0 // indirect
205-
golang.org/x/sys v0.17.0 // indirect
206-
golang.org/x/term v0.17.0 // indirect
205+
golang.org/x/sys v0.18.0 // indirect
206+
golang.org/x/term v0.18.0 // indirect
207207
golang.org/x/text v0.14.0 // indirect
208208
golang.org/x/time v0.5.0 // indirect
209209
golang.org/x/tools v0.17.0 // indirect
@@ -214,7 +214,7 @@ require (
214214
google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
215215
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
216216
google.golang.org/grpc v1.61.1 // indirect
217-
google.golang.org/protobuf v1.32.0 // indirect
217+
google.golang.org/protobuf v1.33.0 // indirect
218218
gopkg.in/inf.v0 v0.9.1 // indirect
219219
gopkg.in/ini.v1 v1.67.0 // indirect
220220
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect

‎go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
576576
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
577577
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
578578
github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
579-
github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI=
580-
github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE=
579+
github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ=
580+
github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ=
581581
github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
582582
github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
583583
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -710,8 +710,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
710710
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
711711
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
712712
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
713-
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
714-
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
713+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
714+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
715715
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
716716
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
717717
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -787,16 +787,16 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
787787
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
788788
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
789789
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
790-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
791-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
790+
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
791+
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
792792
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
793793
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
794794
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
795795
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
796796
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
797797
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
798-
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
799-
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
798+
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
799+
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
800800
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
801801
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
802802
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -870,15 +870,15 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
870870
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
871871
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
872872
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
873-
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
874-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
873+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
874+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
875875
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
876876
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
877877
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
878878
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
879879
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
880-
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
881-
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
880+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
881+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
882882
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
883883
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
884884
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1039,8 +1039,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
10391039
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
10401040
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
10411041
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1042-
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
1043-
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
1042+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
1043+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
10441044
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
10451045
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10461046
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎versions.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
# by default with the OpenTelemetry Operator. This would usually be the latest
33
# stable OpenTelemetry version. When you update this file, make sure to update the
44
# the docs as well.
5-
opentelemetry-collector=0.95.0
5+
opentelemetry-collector=0.96.0
66

77
# Represents the current release of the OpenTelemetry Operator.
8-
operator=0.95.0
8+
operator=0.96.0
99

1010
# Represents the current release of the Target Allocator.
11-
targetallocator=0.95.0
11+
targetallocator=0.96.0
1212

1313
# Represents the current release of the Operator OpAMP Bridge.
14-
operator-opamp-bridge=0.95.0
14+
operator-opamp-bridge=0.96.0
1515

1616
# Represents the current release of Java instrumentation.
1717
# Should match autoinstrumentation/java/version.txt

0 commit comments

Comments
 (0)