Skip to content

Commit e0a2323

Browse files
crossoverJiecrossoverJie
authored
Merge branch 'open-telemetry:main' into support-extensions
2 parents f55949d + 78e7c2f commit e0a2323

File tree

5 files changed

+41
-65
lines changed

5 files changed

+41
-65
lines changed

‎.chloggen/remove-env-var-validation.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: instrumentation
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Remove env var prefix validation
9+
10+
# One or more tracking issues related to the change
11+
issues: [2768]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
path: bin
5454
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
5555
- name: Install chainsaw
56-
uses: kyverno/[email protected].8
56+
uses: kyverno/[email protected].9
5757
- name: Install tools
5858
run: make install-tools
5959
- name: Prepare e2e tests

‎apis/v1alpha1/instrumentation_webhook.go

-40
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ import (
3131
"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
3232
)
3333

34-
const (
35-
envPrefix = "OTEL_"
36-
envSplunkPrefix = "SPLUNK_"
37-
)
38-
3934
var (
4035
_ admission.CustomValidator = &InstrumentationWebhook{}
4136
_ admission.CustomDefaulter = &InstrumentationWebhook{}
@@ -245,44 +240,9 @@ func (w InstrumentationWebhook) validate(r *Instrumentation) (admission.Warnings
245240
default:
246241
return warnings, fmt.Errorf("spec.sampler.type is not valid: %s", r.Spec.Sampler.Type)
247242
}
248-
249-
// validate env vars
250-
if err := w.validateEnv(r.Spec.Env); err != nil {
251-
return warnings, err
252-
}
253-
if err := w.validateEnv(r.Spec.Java.Env); err != nil {
254-
return warnings, err
255-
}
256-
if err := w.validateEnv(r.Spec.NodeJS.Env); err != nil {
257-
return warnings, err
258-
}
259-
if err := w.validateEnv(r.Spec.Python.Env); err != nil {
260-
return warnings, err
261-
}
262-
if err := w.validateEnv(r.Spec.DotNet.Env); err != nil {
263-
return warnings, err
264-
}
265-
if err := w.validateEnv(r.Spec.Go.Env); err != nil {
266-
return warnings, err
267-
}
268-
if err := w.validateEnv(r.Spec.ApacheHttpd.Env); err != nil {
269-
return warnings, err
270-
}
271-
if err := w.validateEnv(r.Spec.Nginx.Env); err != nil {
272-
return warnings, err
273-
}
274243
return warnings, nil
275244
}
276245

277-
func (w InstrumentationWebhook) validateEnv(envs []corev1.EnvVar) error {
278-
for _, env := range envs {
279-
if !strings.HasPrefix(env.Name, envPrefix) && !strings.HasPrefix(env.Name, envSplunkPrefix) {
280-
return fmt.Errorf("env name should start with \"OTEL_\" or \"SPLUNK_\": %s", env.Name)
281-
}
282-
}
283-
return nil
284-
}
285-
286246
func validateJaegerRemoteSamplerArgument(argument string) error {
287247
parts := strings.Split(argument, ",")
288248

‎go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ require (
3838
go.uber.org/multierr v1.11.0
3939
gopkg.in/yaml.v2 v2.4.0
4040
gopkg.in/yaml.v3 v3.0.1
41-
k8s.io/api v0.29.2
42-
k8s.io/apiextensions-apiserver v0.29.2
43-
k8s.io/apimachinery v0.29.2
44-
k8s.io/client-go v0.29.2
45-
k8s.io/component-base v0.29.2
41+
k8s.io/api v0.29.3
42+
k8s.io/apiextensions-apiserver v0.29.3
43+
k8s.io/apimachinery v0.29.3
44+
k8s.io/client-go v0.29.3
45+
k8s.io/component-base v0.29.3
4646
k8s.io/klog/v2 v2.120.1
47-
k8s.io/kubectl v0.29.2
47+
k8s.io/kubectl v0.29.3
4848
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4949
sigs.k8s.io/controller-runtime v0.17.2
5050
sigs.k8s.io/yaml v1.4.0
@@ -76,7 +76,7 @@ require (
7676
github.com/dennwc/varint v1.0.0 // indirect
7777
github.com/digitalocean/godo v1.108.0 // indirect
7878
github.com/distribution/reference v0.5.0 // indirect
79-
github.com/docker/docker v25.0.0+incompatible // indirect
79+
github.com/docker/docker v25.0.5+incompatible // indirect
8080
github.com/docker/go-connections v0.4.0 // indirect
8181
github.com/docker/go-units v0.5.0 // indirect
8282
github.com/edsrzf/mmap-go v1.1.0 // indirect
@@ -115,7 +115,7 @@ require (
115115
github.com/gogo/protobuf v1.3.2 // indirect
116116
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
117117
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
118-
github.com/golang/protobuf v1.5.3 // indirect
118+
github.com/golang/protobuf v1.5.4 // indirect
119119
github.com/golang/snappy v0.0.4 // indirect
120120
github.com/google/gnostic-models v0.6.8 // indirect
121121
github.com/google/go-cmp v0.6.0 // indirect

‎go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK
132132
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
133133
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
134134
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
135-
github.com/docker/docker v25.0.0+incompatible h1:g9b6wZTblhMgzOT2tspESstfw6ySZ9kdm94BLDKaZac=
136-
github.com/docker/docker v25.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
135+
github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE=
136+
github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
137137
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
138138
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
139139
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -279,8 +279,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
279279
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
280280
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
281281
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
282-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
283-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
282+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
283+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
284284
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
285285
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
286286
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -1075,22 +1075,22 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
10751075
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
10761076
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10771077
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1078-
k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
1079-
k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
1080-
k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg=
1081-
k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8=
1082-
k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
1083-
k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
1084-
k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
1085-
k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
1086-
k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
1087-
k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
1078+
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
1079+
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
1080+
k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI=
1081+
k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc=
1082+
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
1083+
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
1084+
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
1085+
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
1086+
k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo=
1087+
k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio=
10881088
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
10891089
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
10901090
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a h1:ZeIPbyHHqahGIbeyLJJjAUhnxCKqXaDY+n89Ms8szyA=
10911091
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
1092-
k8s.io/kubectl v0.29.2 h1:uaDYaBhumvkwz0S2XHt36fK0v5IdNgL7HyUniwb2IUo=
1093-
k8s.io/kubectl v0.29.2/go.mod h1:BhizuYBGcKaHWyq+G7txGw2fXg576QbPrrnQdQDZgqI=
1092+
k8s.io/kubectl v0.29.3 h1:RuwyyIU42MAISRIePaa8Q7A3U74Q9P4MoJbDFz9o3us=
1093+
k8s.io/kubectl v0.29.3/go.mod h1:yCxfY1dbwgVdEt2zkJ6d5NNLOhhWgTyrqACIoFhpdd4=
10941094
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
10951095
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
10961096
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

0 commit comments

Comments
 (0)