Skip to content

Commit

Permalink
Do not add tracing CLI args to opa-openshift container
Browse files Browse the repository at this point in the history
The opa-openshift container does not support
`--internal.tracing.endpoint` and remains in a crashloop if
```
spec:
  observability:
    tracing:
      jaeger_agent_endpoint: ...
      sampling_fraction: "1"
```
is enabled.

Signed-off-by: Andreas Gerstmayr <[email protected]>
  • Loading branch information
andreasgerstmayr committed Nov 4, 2024
1 parent 8c618d6 commit 459c81b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions internal/manifests/gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,11 @@ func patchTracing(tempo v1alpha1.TempoStack, pod corev1.PodTemplateSpec) (corev1
}

for i := range pod.Spec.Containers {
if err := mergo.Merge(&pod.Spec.Containers[i], container, mergo.WithAppendSlice); err != nil {
return corev1.PodTemplateSpec{}, err
// Only the observatorium-api container is instrumented with traces, not the opa-openshift container.
if pod.Spec.Containers[i].Name == containerNameTempoGateway {
if err := mergo.Merge(&pod.Spec.Containers[i], container, mergo.WithAppendSlice); err != nil {
return corev1.PodTemplateSpec{}, err
}
}
}

Expand Down

0 comments on commit 459c81b

Please sign in to comment.