Merge branch 'main' into kaito-090

Author: sozercan

.github/workflows/e2e-backend.yml

@@ -50,9 +50,9 @@ jobs:
 
       - name: Build and deploy KAITO provider
         run: |
-          make kaito-provider-docker-build KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito docker-build IMG=kaito-provider:e2e
           kind load docker-image kaito-provider:e2e --name kubeairunway-backend-e2e
-          make kaito-provider-deploy KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito deploy IMG=kaito-provider:e2e
           kubectl wait --for=condition=Available deployment -n kubeairunway-system -l control-plane=kaito-provider --timeout=120s
 
       - name: Wait for provider registration

.github/workflows/e2e-controller.yml

@@ -45,9 +45,9 @@ jobs:
 
       - name: Build and deploy KAITO provider
         run: |
-          make kaito-provider-docker-build KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito docker-build IMG=kaito-provider:e2e
           kind load docker-image kaito-provider:e2e --name kubeairunway-e2e
-          make kaito-provider-deploy KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito deploy IMG=kaito-provider:e2e
           kubectl wait --for=condition=Available deployment -n kubeairunway-system -l control-plane=kaito-provider --timeout=120s
 
       - name: Wait for provider registration

.github/workflows/e2e-gateway.yml

@@ -71,9 +71,9 @@ jobs:
 
       - name: Build and deploy KAITO provider
         run: |
-          make kaito-provider-docker-build KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito docker-build IMG=kaito-provider:e2e
           kind load docker-image kaito-provider:e2e --name kubeairunway-gw-e2e
-          make kaito-provider-deploy KAITO_PROVIDER_IMG=kaito-provider:e2e
+          make -C providers/kaito deploy IMG=kaito-provider:e2e
           kubectl wait --for=condition=Available deployment -n kubeairunway-system -l control-plane=kaito-provider --timeout=120s
 
       - name: Wait for provider registration

.github/workflows/release-llmd-provider.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
@@ -36,7 +36,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
         with:
           context: .
           file: providers/llmd/Dockerfile

.github/workflows/release.yml

@@ -197,3 +197,47 @@ jobs:
             GIT_COMMIT=${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+  model-downloader-docker:
+    name: Build and Push Model Downloader Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
+        with:
+          images: ghcr.io/kaito-project/kubeairunway/model-downloader
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha,prefix=
+            type=raw,value=latest,enable=${{ !contains(github.ref, '-rc') && !contains(github.ref, '-beta') && !contains(github.ref, '-alpha') }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
+        with:
+          context: images/model-downloader
+          file: images/model-downloader/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/test.yml

@@ -65,8 +65,19 @@ jobs:
 
       - name: Check for manifest drift
         run: |
-          if ! diff -u deploy/kubernetes/controller.yaml /tmp/controller.yaml; then
-            echo "❌ deploy/kubernetes/controller.yaml is out of date."
+          if ! diff -u deploy/controller.yaml /tmp/controller.yaml; then
+            echo "❌ deploy/controller.yaml is out of date."
+            echo "Run 'make generate-deploy-manifests' and commit the result."
+            exit 1
+          fi
+
+      - name: Generate dashboard manifest
+        run: controller/bin/kustomize build backend/config/default > /tmp/dashboard.yaml
+
+      - name: Check for dashboard manifest drift
+        run: |
+          if ! diff -u deploy/dashboard.yaml /tmp/dashboard.yaml; then
+            echo "❌ deploy/dashboard.yaml is out of date."
             echo "Run 'make generate-deploy-manifests' and commit the result."
             exit 1
           fi

CONTRIBUTING.md

@@ -170,11 +170,13 @@ Providers are independent Go operators in `providers/<name>/`. See existing prov
    - Map provider resource status back to `ModelDeployment` status
    - Self-register an `InferenceProviderConfig` with capabilities, selection rules, and installation info
 
-3. **Add Makefile targets** in the root `Makefile`:
+3. **Add a Makefile** in the provider directory (`providers/<name>/Makefile`):
    ```bash
-   make <name>-provider-build         # Build provider binary
-   make <name>-provider-docker-build  # Build Docker image
-   make <name>-provider-deploy        # Deploy to cluster
+   cd providers/<name>
+   make build                       # Build provider binary
+   make docker-build                # Build Docker image
+   make deploy                      # Deploy to cluster
+   make generate-deploy-manifests   # Generate deploy YAML
    ```
 
 ## Adding a New Model

Makefile

@@ -1,22 +1,19 @@
 .PHONY: install dev dev-frontend dev-backend build compile lint test clean help
 .PHONY: controller-build controller-docker-build controller-install controller-deploy controller-generate generate-deploy-manifests
-.PHONY: kaito-provider-build kaito-provider-docker-build kaito-provider-deploy
-.PHONY: dynamo-provider-build dynamo-provider-docker-build dynamo-provider-deploy
-.PHONY: kuberay-provider-build kuberay-provider-docker-build kuberay-provider-deploy
-.PHONY: llmd-provider-build llmd-provider-docker-build llmd-provider-deploy
+.PHONY: model-downloader-docker-build
 
 # Controller image
 CONTROLLER_IMG ?= ghcr.io/kaito-project/kubeairunway/controller:latest
 
+# Dashboard image
+DASHBOARD_IMG ?= ghcr.io/kaito-project/kubeairunway/dashboard:latest
+
+# Model downloader image
+MODEL_DOWNLOADER_IMG ?= ghcr.io/kaito-project/kubeairunway/model-downloader:latest
+
 # Gateway API Inference Extension version
 GAIE_VERSION ?= v1.3.1
 
-# Provider images
-KAITO_PROVIDER_IMG ?= ghcr.io/kaito-project/kubeairunway/kaito-provider:latest
-DYNAMO_PROVIDER_IMG ?= ghcr.io/kaito-project/kubeairunway/dynamo-provider:latest
-KUBERAY_PROVIDER_IMG ?= ghcr.io/kaito-project/kubeairunway/kuberay-provider:latest
-LLMD_PROVIDER_IMG ?= ghcr.io/kaito-project/kubeairunway/llmd-provider:latest
-
 # Default target
 help:
 	@echo "KubeAIRunway Development Commands"
@@ -41,24 +38,11 @@ help:
 	@echo "Controller Targets:"
 	@echo "  controller-build       Build the Go controller binary"
 	@echo "  controller-docker-build Build controller Docker image"
+	@echo "  model-downloader-docker-build Build model downloader Docker image"
 	@echo "  controller-install     Install CRDs into cluster"
 	@echo "  controller-deploy      Deploy controller to cluster"
 	@echo "  controller-generate    Generate CRD manifests and code"
-	@echo "  generate-deploy-manifests  Generate deploy/kubernetes/controller.yaml"
-	@echo ""
-	@echo "Provider Targets:"
-	@echo "  kaito-provider-build          Build the KAITO provider binary"
-	@echo "  kaito-provider-docker-build   Build KAITO provider Docker image"
-	@echo "  kaito-provider-deploy         Deploy KAITO provider to cluster"
-	@echo "  dynamo-provider-build         Build the Dynamo provider binary"
-	@echo "  dynamo-provider-docker-build  Build Dynamo provider Docker image"
-	@echo "  dynamo-provider-deploy        Deploy Dynamo provider to cluster"
-	@echo "  kuberay-provider-build        Build the KubeRay provider binary"
-	@echo "  kuberay-provider-docker-build Build KubeRay provider Docker image"
-	@echo "  kuberay-provider-deploy       Deploy KubeRay provider to cluster"
-	@echo "  llmd-provider-build           Build the llm-d provider binary"
-	@echo "  llmd-provider-docker-build    Build llm-d provider Docker image"
-	@echo "  llmd-provider-deploy          Deploy llm-d provider to cluster"
+	@echo "  generate-deploy-manifests  Generate deploy/controller.yaml"
 	@echo ""
 	@echo "  help                   Show this help message"
 
@@ -171,75 +155,20 @@ controller-test:
 	cd controller && go test ./... -coverprofile cover.out
 	@echo "✅ Controller tests completed"
 
-# Generate deploy manifests for controller
+# Generate deploy manifests for controller and dashboard
 generate-deploy-manifests:
 	cd controller && $(MAKE) kustomize
 	cd controller/config/manager && ../../bin/kustomize edit set image controller=$(CONTROLLER_IMG)
-	cd controller && bin/kustomize build config/default > ../deploy/kubernetes/controller.yaml
-	@echo "✅ Generated deploy/kubernetes/controller.yaml"
-
-# ==================== Provider Targets ====================
-
-# Build the KAITO provider binary
-kaito-provider-build:
-	cd providers/kaito && go build -o bin/provider ./cmd/main.go
-	@echo "✅ KAITO provider built"
-
-# Build the Dynamo provider binary
-dynamo-provider-build:
-	cd providers/dynamo && go build -o bin/provider ./cmd/main.go
-	@echo "✅ Dynamo provider built"
-
-# Build KAITO provider Docker image
-kaito-provider-docker-build:
-	docker build -f providers/kaito/Dockerfile -t $(KAITO_PROVIDER_IMG) .
-	@echo "✅ KAITO provider image built: $(KAITO_PROVIDER_IMG)"
-
-# Build Dynamo provider Docker image
-dynamo-provider-docker-build:
-	docker build -f providers/dynamo/Dockerfile -t $(DYNAMO_PROVIDER_IMG) .
-	@echo "✅ Dynamo provider image built: $(DYNAMO_PROVIDER_IMG)"
-
-# Deploy KAITO provider to the K8s cluster
-kaito-provider-deploy:
-	cd providers/kaito/config/manager && kustomize edit set image IMAGE_PLACEHOLDER=$(KAITO_PROVIDER_IMG)
-	kustomize build providers/kaito/config/default | kubectl apply -f -
-	@echo "✅ KAITO provider deployed"
-
-# Deploy Dynamo provider to the K8s cluster
-dynamo-provider-deploy:
-	cd providers/dynamo/config/manager && kustomize edit set image IMAGE_PLACEHOLDER=$(DYNAMO_PROVIDER_IMG)
-	kustomize build providers/dynamo/config/default | kubectl apply -f -
-	@echo "✅ Dynamo provider deployed"
-
-# Build KubeRay provider binary
-kuberay-provider-build:
-	cd providers/kuberay && go build -o bin/provider ./cmd/main.go
-	@echo "✅ KubeRay provider built"
-
-# Build KubeRay provider Docker image
-kuberay-provider-docker-build:
-	docker build -f providers/kuberay/Dockerfile -t $(KUBERAY_PROVIDER_IMG) .
-	@echo "✅ KubeRay provider image built: $(KUBERAY_PROVIDER_IMG)"
-
-# Deploy KubeRay provider to the K8s cluster
-kuberay-provider-deploy:
-	cd providers/kuberay/config/manager && kustomize edit set image IMAGE_PLACEHOLDER=$(KUBERAY_PROVIDER_IMG)
-	kustomize build providers/kuberay/config/default | kubectl apply -f -
-	@echo "✅ KubeRay provider deployed"
-
-# Build the llm-d provider binary
-llmd-provider-build:
-	cd providers/llmd && go build -o bin/provider ./cmd/main.go
-	@echo "✅ llm-d provider built"
-
-# Build llm-d provider Docker image
-llmd-provider-docker-build:
-	docker build --platform linux/amd64 -f providers/llmd/Dockerfile -t $(LLMD_PROVIDER_IMG) .
-	@echo "✅ llm-d provider image built: $(LLMD_PROVIDER_IMG)"
-
-# Deploy llm-d provider to the K8s cluster
-llmd-provider-deploy:
-	cd providers/llmd/config/manager && kustomize edit set image IMAGE_PLACEHOLDER=$(LLMD_PROVIDER_IMG)
-	kustomize build providers/llmd/config/default | kubectl apply -f -
-	@echo "✅ llm-d provider deployed"
+	cd controller && bin/kustomize build config/default > ../deploy/controller.yaml
+	@echo "✅ Generated deploy/controller.yaml"
+	cd backend/config/manager && ../../../controller/bin/kustomize edit set image IMAGE_PLACEHOLDER=$(DASHBOARD_IMG)
+	controller/bin/kustomize build backend/config/default > deploy/dashboard.yaml
+	@git checkout backend/config/manager/kustomization.yaml 2>/dev/null || true
+	@echo "✅ Generated deploy/dashboard.yaml"
+
+# ==================== Model Downloader Targets ====================
+
+# Build model downloader Docker image
+model-downloader-docker-build:
+	docker build -f images/model-downloader/Dockerfile -t $(MODEL_DOWNLOADER_IMG) images/model-downloader
+	@echo "✅ Model downloader image built: $(MODEL_DOWNLOADER_IMG)"

README.md

@@ -21,12 +21,12 @@ KubeAIRunway gives you a web UI and a unified Kubernetes CRD (`ModelDeployment`)
 
 ## Supported Providers
 
-| Provider | Description |
-| --- | --- |
-| [**NVIDIA Dynamo**](https://github.com/ai-dynamo/dynamo) | GPU-accelerated inference with aggregated or disaggregated serving |
-| [**KubeRay**](https://github.com/ray-project/kuberay) | Ray-based distributed inference |
-| [**KAITO**](https://github.com/kaito-project/kaito) | vLLM (GPU) and llama.cpp (CPU/GPU) support |
-| [**LLM-D**](https://github.com/llm-d/llm-d) | vLLM (GPU) with aggregated or disaggregated serving |
+| Provider                                                 | Description                                                        | Provider Shim                                         |
+| -------------------------------------------------------- | ------------------------------------------------------------------ | ----------------------------------------------------- |
+| [**NVIDIA Dynamo**](https://github.com/ai-dynamo/dynamo) | GPU-accelerated inference with aggregated or disaggregated serving | [dynamo.yaml](providers/dynamo/deploy/dynamo.yaml)    |
+| [**KubeRay**](https://github.com/ray-project/kuberay)    | Ray-based distributed inference                                    | [kuberay.yaml](providers/kuberay/deploy/kuberay.yaml) |
+| [**KAITO**](https://github.com/kaito-project/kaito)      | vLLM (GPU) and llama.cpp (CPU/GPU) support                         | [kaito.yaml](providers/kaito/deploy/kaito.yaml)       |
+| [**LLM-D**](https://github.com/llm-d/llm-d)              | vLLM (GPU) with aggregated or disaggregated serving                | [llmd.yaml](providers/llmd/deploy/llmd.yaml)          |
 
 ## Quick Start
 
@@ -52,21 +52,22 @@ Open **http://localhost:3001**
 
 ```bash
 # Install CRDs and controller (required)
-kubectl apply -f https://raw.githubusercontent.com/kaito-project/kubeairunway/main/deploy/kubernetes/controller.yaml
+kubectl apply -f https://raw.githubusercontent.com/kaito-project/kubeairunway/main/deploy/controller.yaml
 
 # Install dashboard UI (optional)
-kubectl apply -f https://raw.githubusercontent.com/kaito-project/kubeairunway/main/deploy/kubernetes/dashboard.yaml
+kubectl apply -f https://raw.githubusercontent.com/kaito-project/kubeairunway/main/deploy/dashboard.yaml
 kubectl port-forward -n kubeairunway-system svc/kubeairunway 3001:80
 ```
 
-Open **http://localhost:3001** — see [deployment docs](deploy/kubernetes/README.md) for more options.
+Open **http://localhost:3001** — see [deployment docs](deploy/README.md) for more options.
 
 ### Getting Started
 
-1. **Install a provider** — Go to the Installation page and install your preferred provider via Helm
-2. **Connect HuggingFace** — Sign in via Settings → HuggingFace (required for gated models)
-3. **Deploy a model** — Browse the catalog, pick a model, configure, and deploy
-4. **Monitor** — Track status, stream logs, and view metrics on the Deployments page
+1. **Install a provider shim** — Apply one or more provider shims to register providers with KubeAIRunway. See [Supported Providers](#supported-providers) for available options.
+2. **Install the provider** — Go to the Installation page and install the upstream provider via Helm
+3. **Connect HuggingFace** — Sign in via Settings → HuggingFace (optional for non-gated models)
+4. **Deploy a model** — Browse the catalog, pick a model, configure, and deploy
+5. **Monitor** — Track status, stream logs, and view metrics on the Deployments page
 
 ### Access Your Model
 
@@ -102,7 +103,7 @@ The controller automatically selects the best engine and provider, creates provi
 | Providers | [docs/providers.md](docs/providers.md) |
 | Observability | [docs/observability.md](docs/observability.md) |
 | Development | [docs/development.md](docs/development.md) |
-| Kubernetes Deployment | [deploy/kubernetes/README.md](deploy/kubernetes/README.md) |
+| Kubernetes Deployment | [deploy/README.md](deploy/README.md) |
 | Gateway Integration | [docs/gateway.md](docs/gateway.md) |
 | Headlamp Plugin | [docs/headlamp-plugin.md](docs/headlamp-plugin.md) |
 

backend/config/default/kustomization.yaml

@@ -0,0 +1,5 @@
+resources:
+- ../rbac
+- ../manager
+transformers:
+- namespace-transformer.yaml