Skip to content

Commit aeec397

Browse files
Merge remote-tracking branch 'origin/main' into test/5296-credential-gating-pilot/matthewgrossman
Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
2 parents e22087f + 56d2350 commit aeec397

68 files changed

Lines changed: 3419 additions & 1246 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/helm-dev-environment/SKILL.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,9 @@ task running while using those endpoints.
266266
### Viewing local traces
267267

268268
The gateway exports OTLP/gRPC to
269-
`http://openshell-collector.observability.svc.cluster.local:4317` through the
270-
default Skaffold values. Forward OTLP/gRPC and the trace UI to the host:
269+
`http://openshell-collector.observability.svc.cluster.local:4317` through
270+
`ci/values-local-tracing.yaml`, which only `skaffold.yaml` layers. The Kubernetes
271+
E2E wrapper omits it, so E2E clusters export no traces. Forward OTLP/gRPC and the trace UI to the host:
271272

272273
```bash
273274
mise run helm:k3s:forward
@@ -278,9 +279,10 @@ Kubernetes compute-driver spans under their distinct service names, along with
278279
Agent Sandbox controller reconciliation spans linked through the Sandbox
279280
trace-context annotation. The same command exposes OTLP/gRPC on
280281
`http://127.0.0.1:4317` and, when deployed, the Kubernetes gateway on
281-
`http://127.0.0.1:8090`. The local `gateway:docker`, `gateway:podman`, and
282-
`gateway:vm` tasks detect the collector listener at startup and enable trace
283-
export, OCSF log export, and the agent trace relay only while it is reachable.
282+
`http://127.0.0.1:8090`. The local `gateway`, `gateway:docker`,
283+
`gateway:podman`, and `gateway:vm` tasks enable trace export, OCSF log export,
284+
and the agent trace relay only when `OPENSHELL_DEV_OTLP_ENDPOINT` is set, for
285+
example `OPENSHELL_DEV_OTLP_ENDPOINT=http://127.0.0.1:4317`.
284286
Spans an agent exports from inside a sandbox arrive through the supervisor's
285287
relay with `openshell.telemetry.source=agent` and share `openshell.sandbox.id`
286288
with that sandbox's supervisor spans.
@@ -642,6 +644,7 @@ for dependencies still declared in `Chart.yaml`.
642644
| `deploy/helm/openshell/skaffold.yaml` | Skaffold config — images, Helm releases, values overlays |
643645
| `deploy/helm/openshell/values.yaml` | Default Helm values |
644646
| `deploy/helm/openshell/ci/values-skaffold.yaml` | Dev overrides (image pull policy, TLS disabled for local Skaffold) |
647+
| `deploy/helm/openshell/ci/values-local-tracing.yaml` | OTLP export to the `helm:k3s:create` collector (Skaffold only) |
645648
| `deploy/helm/openshell/ci/values-cert-manager.yaml` | cert-manager PKI overlay (opt-in; disables pkiInitJob) |
646649
| `deploy/helm/openshell/ci/values-gateway.yaml` | Envoy Gateway GRPCRoute + Gateway overlay |
647650
| `deploy/helm/openshell/ci/values-high-availability.yaml` | HA test overlay (`replicaCount: 2` with external PostgreSQL Secret) |

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)