From 4011bf44bdea6dc9e7a367c4802d07d71e484496 Mon Sep 17 00:00:00 2001 From: Pablo Felix Estevez Pico Date: Fri, 19 Jun 2026 16:42:43 +0200 Subject: [PATCH] Update catalog Dockerfiles: swap llm-d component labels for onboarding Replace offboarded llm-d-inference-scheduler and llm-d-routing-sidecar ARGs and labels with the new llm-d-router-endpoint-picker and llm-d-router-disagg-sidecar in all 4 catalog Dockerfiles (v4.19-v4.22). The onboarding skill updated the bundle Dockerfile but skipped the catalog Dockerfiles. Without these labels, the tracer cannot map images to git commits for the new components. Jira: RHOAIENG-69738, RHOAIENG-69343 Co-Authored-By: Claude Opus 4.6 --- catalog/v4.19/Dockerfile | 16 ++++++++-------- catalog/v4.20/Dockerfile | 16 ++++++++-------- catalog/v4.21/Dockerfile | 16 ++++++++-------- catalog/v4.22/Dockerfile | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/catalog/v4.19/Dockerfile b/catalog/v4.19/Dockerfile index 0b2d2dc02d..a033eb5934 100644 --- a/catalog/v4.19/Dockerfile +++ b/catalog/v4.19/Dockerfile @@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL= ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT= ARG ODH_MAAS_API_GIT_URL= ARG ODH_MAAS_API_GIT_COMMIT= ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL= @@ -255,10 +255,10 @@ LABEL \ odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \ odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \ odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \ - odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \ - odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \ - odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \ - odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \ + odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \ + odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \ + odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \ + odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \ odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \ odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \ odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \ diff --git a/catalog/v4.20/Dockerfile b/catalog/v4.20/Dockerfile index a988529469..2a0ae25ba4 100644 --- a/catalog/v4.20/Dockerfile +++ b/catalog/v4.20/Dockerfile @@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL= ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT= ARG ODH_MAAS_API_GIT_URL= ARG ODH_MAAS_API_GIT_COMMIT= ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL= @@ -255,10 +255,10 @@ LABEL \ odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \ odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \ odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \ - odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \ - odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \ - odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \ - odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \ + odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \ + odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \ + odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \ + odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \ odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \ odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \ odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \ diff --git a/catalog/v4.21/Dockerfile b/catalog/v4.21/Dockerfile index 2cb7800153..fed78fdb5d 100644 --- a/catalog/v4.21/Dockerfile +++ b/catalog/v4.21/Dockerfile @@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL= ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT= ARG ODH_MAAS_API_GIT_URL= ARG ODH_MAAS_API_GIT_COMMIT= ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL= @@ -257,10 +257,10 @@ LABEL \ odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \ odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \ odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \ - odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \ - odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \ - odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \ - odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \ + odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \ + odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \ + odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \ + odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \ odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \ odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \ odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \ diff --git a/catalog/v4.22/Dockerfile b/catalog/v4.22/Dockerfile index a29601d791..8041d2755f 100644 --- a/catalog/v4.22/Dockerfile +++ b/catalog/v4.22/Dockerfile @@ -52,10 +52,10 @@ ARG ODH_LLAMA_STACK_CORE_GIT_URL= ARG ODH_LLAMA_STACK_CORE_GIT_COMMIT= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL= ARG ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL= -ARG ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_URL= -ARG ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL= +ARG ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL= +ARG ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT= ARG ODH_MAAS_API_GIT_URL= ARG ODH_MAAS_API_GIT_COMMIT= ARG ODH_ML_PIPELINES_API_SERVER_V2_GIT_URL= @@ -257,10 +257,10 @@ LABEL \ odh-llama-stack-core.git.commit="${ODH_LLAMA_STACK_CORE_GIT_COMMIT}" \ odh-llama-stack-k8s-operator.git.url="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_URL}" \ odh-llama-stack-k8s-operator.git.commit="${ODH_LLAMA_STACK_K8S_OPERATOR_GIT_COMMIT}" \ - odh-llm-d-inference-scheduler.git.url="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_URL}" \ - odh-llm-d-inference-scheduler.git.commit="${ODH_LLM_D_INFERENCE_SCHEDULER_GIT_COMMIT}" \ - odh-llm-d-routing-sidecar.git.url="${ODH_LLM_D_ROUTING_SIDECAR_GIT_URL}" \ - odh-llm-d-routing-sidecar.git.commit="${ODH_LLM_D_ROUTING_SIDECAR_GIT_COMMIT}" \ + odh-llm-d-router-endpoint-picker.git.url="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_URL}" \ + odh-llm-d-router-endpoint-picker.git.commit="${ODH_LLM_D_ROUTER_ENDPOINT_PICKER_GIT_COMMIT}" \ + odh-llm-d-router-disagg-sidecar.git.url="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_URL}" \ + odh-llm-d-router-disagg-sidecar.git.commit="${ODH_LLM_D_ROUTER_DISAGG_SIDECAR_GIT_COMMIT}" \ odh-maas-api.git.url="${ODH_MAAS_API_GIT_URL}" \ odh-maas-api.git.commit="${ODH_MAAS_API_GIT_COMMIT}" \ odh-mlflow.git.url="${ODH_MLFLOW_GIT_URL}" \