Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/nvca-operator/nvca-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ used in Kubernetes Clusters to run NVCF Workloads.
| `agent.gpuProfiling.labelKey` | Pod label key NVCA applies to profiled function pods (the label the Nsight Operator watches for). Empty uses the built-in default "nvidia-nsight-profile". | `""` |
| `agent.gpuProfiling.labelValue` | Pod label value NVCA applies to profiled function pods. Empty uses the built-in default "enabled". | `""` |
| `agent.byooOtelCollector.imageRepository` | Optional BYOO OpenTelemetry Collector image repository. If unset, it is derived from image.repository. | `""` |
| `agent.byooOtelCollector.imageTag` | BYOO OpenTelemetry Collector image tag. | `0.157.11` |
| `agent.byooOtelCollector.imageTag` | BYOO OpenTelemetry Collector image tag. | `0.157.0-nv-0.1.1` |
| `agent.functionEnvOverrides` | Map of environment variable overrides for function workloads (e.g., {"INIT_CONTAINER": "nvcr.io/custom/init:v1.0", "UTILS_CONTAINER": "nvcr.io/custom/utils:v1.0"}) | `{}` |
| `agent.taskEnvOverrides` | Map of environment variable overrides for task workloads (e.g., {"INIT_CONTAINER": "nvcr.io/custom/init:v1.0", "ESS_AGENT_CONTAINER": "nvcr.io/custom/ess:v1.0"}) | `{}` |
| `agent.overrideEnvironmentVariables` | Map of environment variables to override on the NVCA agent container. These take precedence over default values. Example: {"LOG_LEVEL": "debug", "CUSTOM_FLAG": "enabled"} | `{}` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Get the BYOO OTel collector image when its tag is configured.
{{- define "nvcaop.byooOtelCollectorImage" -}}
{{- $agent := .Values.agent | default dict -}}
{{- $byooOtelCollector := $agent.byooOtelCollector | default dict -}}
{{- $imageTag := "0.157.11" -}}
{{- $imageTag := "0.157.0-nv-0.1.1" -}}
{{- if hasKey $byooOtelCollector "imageTag" -}}
{{- $imageTag = $byooOtelCollector.imageTag -}}
{{- end -}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"imageTag": {
"type": "string",
"description": "BYOO OpenTelemetry Collector image tag.",
"default": "0.157.11"
"default": "0.157.0-nv-0.1.1"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/nvca-operator/nvca-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ resources:
## @param agent.taskEnvOverrides Map of environment variable overrides for task workloads (e.g., {"INIT_CONTAINER": "nvcr.io/custom/init:v1.0", "ESS_AGENT_CONTAINER": "nvcr.io/custom/ess:v1.0"})
## @param agent.overrideEnvironmentVariables Map of environment variables to override on the NVCA agent container. These take precedence over default values. Example: {"LOG_LEVEL": "debug", "CUSTOM_FLAG": "enabled"}
## @param agent.tolerations K8s tolerations for the NVCA agent pod
## @param agent.llm.requestRouterAddress Default LLM request-router worker address rendered as STARGATE_ADDRESS for LLM workers
## @param agent.llm.requestRouterAddress Operator default LLM request-router address. Workers read LLM_REQUEST_ROUTER_ADDRESS from the launch environment; not a runtime fallback
## @param agent.serviceOAuth OAuth token and JWKS endpoints used by dependent services
agent:
cacheMountOptionsEnabled: true
Expand All @@ -203,7 +203,7 @@ agent:
## @param agent.byooOtelCollector.imageTag BYOO OpenTelemetry Collector image tag.
byooOtelCollector:
imageRepository: ""
imageTag: "0.157.11"
imageTag: "0.157.0-nv-0.1.1"
## Environment variable overrides for function workloads.
## Available keys: INIT_CONTAINER, UTILS_CONTAINER, OTEL_CONTAINER, BYOO_OTEL_COLLECTOR_CONTAINER,
## NICLLS_CONTAINER, ESS_AGENT_CONTAINER, INFERENCE_CONTAINER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ spec:
value: "nvcr.io/nvidia/nvcf-byoc/nvca"
args:
- --function-env-overrides-b64
- "eyJCWU9PX09URUxfQ09MTEVDVE9SX0NPTlRBSU5FUiI6Im52Y3IuaW8vbnZpZGlhL252Y2YtYnlvYy9ieW9vLW90ZWwtY29sbGVjdG9yOjAuMTU3LjExIn0="
- "eyJCWU9PX09URUxfQ09MTEVDVE9SX0NPTlRBSU5FUiI6Im52Y3IuaW8vbnZpZGlhL252Y2YtYnlvYy9ieW9vLW90ZWwtY29sbGVjdG9yOjAuMTU3LjAtbnYtMC4xLjEifQ=="
- --task-env-overrides-b64
- "eyJCWU9PX09URUxfQ09MTEVDVE9SX0NPTlRBSU5FUiI6Im52Y3IuaW8vbnZpZGlhL252Y2YtYnlvYy9ieW9vLW90ZWwtY29sbGVjdG9yOjAuMTU3LjExIn0="
- "eyJCWU9PX09URUxfQ09MTEVDVE9SX0NPTlRBSU5FUiI6Im52Y3IuaW8vbnZpZGlhL252Y2YtYnlvYy9ieW9vLW90ZWwtY29sbGVjdG9yOjAuMTU3LjAtbnYtMC4xLjEifQ=="
---
apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -91,7 +91,7 @@ expected_images=(
"nvcr.io/nvidia/nvcf-byoc/nvcf-image-credential-helper:0.5.0"
"nvcr.io/nvidia/nvcf-byoc/nvcf-otel-collector:0.157.9"
"nvcr.io/nvidia/nvcf-byoc/samba:1.0.5"
"nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.11"
"nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.0-nv-0.1.1"
)

for image in "${expected_images[@]}"; do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ if [[ "${byoo_function_image}" != "${byoo_task_image}" ]]; then
exit 1
fi

if [[ "${byoo_function_image}" != "nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.11" ]]; then
if [[ "${byoo_function_image}" != "nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.0-nv-0.1.1" ]]; then
echo "unexpected BYOO collector default: ${byoo_function_image}" >&2
exit 1
fi

if [[ "${stage_byoo_function_image}" != "stg.nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.11" || \
if [[ "${stage_byoo_function_image}" != "stg.nvcr.io/nvidia/nvcf-byoc/byoo-otel-collector:0.157.0-nv-0.1.1" || \
"${stage_byoo_task_image}" != "${stage_byoo_function_image}" ]]; then
echo "expected BYOO collector defaults to use the staging image repository" >&2
exit 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ used in Kubernetes Clusters to run NVCF Workloads.
| `agent.gpuProfiling.labelKey` | Pod label key NVCA applies to profiled function pods (the label the Nsight Operator watches for). Empty uses the built-in default "nvidia-nsight-profile". | `""` |
| `agent.gpuProfiling.labelValue` | Pod label value NVCA applies to profiled function pods. Empty uses the built-in default "enabled". | `""` |
| `agent.byooOtelCollector.imageRepository` | Optional BYOO OpenTelemetry Collector image repository. If unset, it is derived from image.repository. | `""` |
| `agent.byooOtelCollector.imageTag` | BYOO OpenTelemetry Collector image tag. | `0.157.11` |
| `agent.byooOtelCollector.imageTag` | BYOO OpenTelemetry Collector image tag. | `0.157.0-nv-0.1.1` |
| `agent.functionEnvOverrides` | Map of environment variable overrides for function workloads (e.g., {"INIT_CONTAINER": "nvcr.io/custom/init:v1.0", "UTILS_CONTAINER": "nvcr.io/custom/utils:v1.0"}) | `{}` |
| `agent.taskEnvOverrides` | Map of environment variable overrides for task workloads (e.g., {"INIT_CONTAINER": "nvcr.io/custom/init:v1.0", "ESS_AGENT_CONTAINER": "nvcr.io/custom/ess:v1.0"}) | `{}` |
| `agent.overrideEnvironmentVariables` | Map of environment variables to override on the NVCA agent container. These take precedence over default values. Example: {"LOG_LEVEL": "debug", "CUSTOM_FLAG": "enabled"} | `{}` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Get the BYOO OTel collector image when its tag is configured.
{{- define "nvcaop.byooOtelCollectorImage" -}}
{{- $agent := .Values.agent | default dict -}}
{{- $byooOtelCollector := $agent.byooOtelCollector | default dict -}}
{{- $imageTag := "0.157.11" -}}
{{- $imageTag := "0.157.0-nv-0.1.1" -}}
{{- if hasKey $byooOtelCollector "imageTag" -}}
{{- $imageTag = $byooOtelCollector.imageTag -}}
{{- end -}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"imageTag": {
"type": "string",
"description": "BYOO OpenTelemetry Collector image tag.",
"default": "0.157.11"
"default": "0.157.0-nv-0.1.1"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ agent:
## @param agent.byooOtelCollector.imageTag BYOO OpenTelemetry Collector image tag.
byooOtelCollector:
imageRepository: ""
imageTag: "0.157.11"
imageTag: "0.157.0-nv-0.1.1"
## Environment variable overrides for function workloads.
## Available keys: INIT_CONTAINER, UTILS_CONTAINER, OTEL_CONTAINER, BYOO_OTEL_COLLECTOR_CONTAINER,
## NICLLS_CONTAINER, ESS_AGENT_CONTAINER, INFERENCE_CONTAINER
Expand Down
Loading