@@ -31,11 +31,6 @@ import (
31
31
"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
32
32
)
33
33
34
- const (
35
- envPrefix = "OTEL_"
36
- envSplunkPrefix = "SPLUNK_"
37
- )
38
-
39
34
var (
40
35
_ admission.CustomValidator = & InstrumentationWebhook {}
41
36
_ admission.CustomDefaulter = & InstrumentationWebhook {}
@@ -245,44 +240,9 @@ func (w InstrumentationWebhook) validate(r *Instrumentation) (admission.Warnings
245
240
default :
246
241
return warnings , fmt .Errorf ("spec.sampler.type is not valid: %s" , r .Spec .Sampler .Type )
247
242
}
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
- }
274
243
return warnings , nil
275
244
}
276
245
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
-
286
246
func validateJaegerRemoteSamplerArgument (argument string ) error {
287
247
parts := strings .Split (argument , "," )
288
248
0 commit comments