Skip to content

Commit df9d8a9

Browse files
committed
Remove env var prefix validation
1 parent 70d47d8 commit df9d8a9

File tree

1 file changed

+0
-40
lines changed

1 file changed

+0
-40
lines changed

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

0 commit comments

Comments
 (0)