Merge branch 'main' into fix-auto-inject-saturation-filter

Author: LukeAVanDrie

.github/actions/docker-build-and-push/action.yml

@@ -33,6 +33,10 @@ inputs:
     required: false
     description: Git commit SHA to embed via COMMIT_SHA build arg
     default: ''
+  additional-tags:
+    required: false
+    description: Additional image tags to push
+    default: ''
 runs:
   using: "composite"
   steps:
@@ -58,6 +62,7 @@ runs:
           ${{ inputs.registry }}/${{ inputs.image-name }}:${{ inputs.tag }}
           ${{ inputs.push == 'true' && inputs.prerelease != 'true' && format('{0}/{1}:latest', inputs.registry, inputs.image-name) || '' }}
           ${{ inputs.commit-sha != '' && format('{0}/{1}:{2}', inputs.registry, inputs.image-name, inputs.commit-sha) || '' }}
+          ${{ inputs.additional-tags }}
         build-args: |
           LDFLAGS=-s -w
           COMMIT_SHA=${{ inputs.commit-sha || 'unknown' }}

.github/actions/helm-build-and-push/action.yml

@@ -12,7 +12,7 @@ inputs:
     required: false
     default: ''
   epp_image_repository:
-    description: 'EPP image repository name (e.g. llm-d-router-endpoint-picker or llm-d-router-endpoint-picker-dev)'
+    description: 'EPP image repository name (e.g. llm-d-router-endpoint-picker)'
     required: false
     default: 'llm-d-router-endpoint-picker'
 runs:

.github/actions/trivy-scan/action.yml

@@ -26,6 +26,11 @@ runs:
         output: 'trivy-results.sarif'
         severity: ${{ inputs.severity }}
         exit-code: '1'
+        # trivy-action drops the severity filter for SARIF output unless told
+        # otherwise, which fails the scan on findings outside `severity` (e.g.
+        # UNKNOWN-severity Go vulndb notes).
+        limit-severities-for-sarif: 'true'
+        version: 'v0.72.0'
 
     - name: Upload Trivy SARIF to Security tab
       uses: github/codeql-action/upload-sarif@v4.35.4 # v4.35.4 68bde559dea0fdcac2102bfdf6230c5f70eb485e

.github/workflows/ci-build-images.yaml

@@ -19,6 +19,14 @@ on:
         required: false
         type: string
         default: ''
+      epp-additional-tags:
+        required: false
+        type: string
+        default: ''
+      sidecar-additional-tags:
+        required: false
+        type: string
+        default: ''
 
 permissions:
   contents: read
@@ -60,6 +68,7 @@ jobs:
           prerelease: ${{ inputs.prerelease }}
           commit-sha: ${{ github.sha }}
           push: 'true'
+          additional-tags: ${{ inputs.epp-additional-tags }}
 
   build-sidecar:
     runs-on: ubuntu-latest
@@ -93,6 +102,7 @@ jobs:
           prerelease: ${{ inputs.prerelease }}
           commit-sha: ${{ github.sha }}
           push: 'true'
+          additional-tags: ${{ inputs.sidecar-additional-tags }}
 
   push-helm-charts:
     needs: [build-epp, build-sidecar]

.github/workflows/ci-coordinator.yaml

@@ -0,0 +1,106 @@
+name: CI - Coordinator Test
+
+# Runs coordinator unit tests and e2e tests. Path filter excludes paths not
+# exercised by the coordinator.
+on:
+  push:
+    branches:
+      - main
+      - 'release-*'
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+  actions: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      src: ${{ steps.filter.outputs.src }}
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v7
+      - uses: dorny/paths-filter@v4
+        id: filter
+        with:
+          filters: |
+            src:
+              - '**/*.go'
+              - Dockerfile.*
+              - Makefile*
+              - go.mod
+              - go.sum
+              - scripts/**
+              - hack/**
+              - test/**
+              - .github/actions/e2e-runner-setup/action.yml
+              - .github/workflows/ci-coordinator.yaml
+              - '!Dockerfile.sidecar'
+              - '!cmd/pd-sidecar/**'
+              - '!pkg/sidecar/**'
+              - '!test/sidecar/**'
+              - '!pkg/generator/**'
+              - '!test/e2e/**'
+              - '!test/integration/**'
+              - '!test/profiling/**'
+              - '!Makefile'
+
+  unit-tests:
+    needs: check-changes
+    if: ${{ needs.check-changes.outputs.src == 'true' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v7
+
+      - name: Create Go cache dirs
+        id: go-cache
+        run: |
+          mkdir -p "$HOME/.cache/llm-d-gomodcache" "$HOME/.cache/llm-d-gobuildcache"
+          echo "mod=$HOME/.cache/llm-d-gomodcache" >> "$GITHUB_OUTPUT"
+          echo "build=$HOME/.cache/llm-d-gobuildcache" >> "$GITHUB_OUTPUT"
+
+      - name: Cache Go modules and build cache
+        uses: actions/cache@v6
+        with:
+          path: |
+            ${{ steps.go-cache.outputs.mod }}
+            ${{ steps.go-cache.outputs.build }}
+          key: go-cache-${{ runner.os }}-${{ hashFiles('go.sum') }}
+          restore-keys: |
+            go-cache-${{ runner.os }}-
+
+      - name: Run coordinator unit tests
+        shell: bash
+        env:
+          GO_MOD_CACHE_VOL: ${{ steps.go-cache.outputs.mod }}
+          GO_BUILD_CACHE_VOL: ${{ steps.go-cache.outputs.build }}
+        run: make -f Makefile.coord.mk test-unit
+
+  e2e-tests:
+    needs: check-changes
+    if: ${{ needs.check-changes.outputs.src == 'true' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v7
+
+      - name: Set up e2e runner
+        id: e2e-setup
+        uses: ./.github/actions/e2e-runner-setup
+
+      - name: Run coordinator e2e tests
+        shell: bash
+        env:
+          GO_MOD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-mod-cache }}
+          GO_BUILD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-build-cache }}
+        run: make -f Makefile.coord.mk test-e2e-coordinator

.github/workflows/ci-dev.yaml

@@ -19,6 +19,8 @@ jobs:
     outputs:
       epp_name: ${{ steps.version.outputs.epp_name }}
       sidecar_name: ${{ steps.version.outputs.sidecar_name }}
+      epp_base_name: ${{ steps.version.outputs.epp_base_name }}
+      sidecar_base_name: ${{ steps.version.outputs.sidecar_base_name }}
       tag: ${{ steps.tag.outputs.tag }}
     steps:
       - name: Set image names
@@ -27,6 +29,8 @@ jobs:
           repo="${GITHUB_REPOSITORY##*/}"
           echo "epp_name=${repo}-endpoint-picker-dev" >> "$GITHUB_OUTPUT"
           echo "sidecar_name=${repo}-disagg-sidecar-dev" >> "$GITHUB_OUTPUT"
+          echo "epp_base_name=${repo}-endpoint-picker" >> "$GITHUB_OUTPUT"
+          echo "sidecar_base_name=${repo}-disagg-sidecar" >> "$GITHUB_OUTPUT"
 
       - name: Set branch name as tag
         id: tag
@@ -42,5 +46,7 @@ jobs:
       sidecar-image-name: ${{ needs.set-params.outputs.sidecar_name }}
       tag: ${{ needs.set-params.outputs.tag }}
       prerelease: true
-      chart-suffix: "-dev"
+      chart-suffix: ""
+      epp-additional-tags: ghcr.io/llm-d/${{ needs.set-params.outputs.epp_base_name }}:main
+      sidecar-additional-tags: ghcr.io/llm-d/${{ needs.set-params.outputs.sidecar_base_name }}:main
 

.github/workflows/ci-lint.yaml

@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: go.mod
           cache: true

.github/workflows/ci-pr-checks.yaml

@@ -1,3 +1,6 @@
+# Matrix jobs (e2e-image-common, e2e-image-router) are each
+# followed by a *-status job that aggregates their result, since GitHub
+# required status checks cannot reference individual matrix legs.
 name: CI - Test
 
 on:
@@ -42,6 +45,11 @@ jobs:
               - .github/actions/docker-build-and-push/action.yml
               - .github/actions/e2e-runner-setup/action.yml
               - .github/workflows/ci-pr-checks.yaml
+              - '!Dockerfile.coordinator'
+              - '!Makefile.coord.mk'
+              - '!cmd/coordinator/**'
+              - '!pkg/coordinator/**'
+              - '!test/coordinator/**'
             helm:
               - 'config/charts/**'
               - 'hack/verify-helm.sh'
@@ -56,7 +64,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: go.mod
 
@@ -105,6 +113,16 @@ jobs:
           GO_BUILD_CACHE_VOL: ${{ steps.go-cache.outputs.build }}
         run: make test-unit
 
+      # Anti-rot: execute the benchmark bodies once so runtime breakage (panics,
+      # deadlocks) is caught. `go test` only compiles benchmarks; it never runs
+      # them without -bench.
+      - name: Run benchmark smoke
+        shell: bash
+        env:
+          GO_MOD_CACHE_VOL: ${{ steps.go-cache.outputs.mod }}
+          GO_BUILD_CACHE_VOL: ${{ steps.go-cache.outputs.build }}
+        run: make bench-smoke
+
       - name: Run hermetic integration tests
         shell: bash
         env:
@@ -222,7 +240,7 @@ jobs:
             archive: llm-d-router-endpoint-picker
           - name: simulator
             source: pull
-            image: ghcr.io/llm-d/llm-d-inference-sim:v0.9.2
+            image: ghcr.io/llm-d/llm-d-inference-sim:v0.10.2
             archive: llm-d-inference-sim
     name: e2e-image-common (${{ matrix.image.name }})
     steps:
@@ -256,6 +274,19 @@ jobs:
           retention-days: 1
           compression-level: 0
 
+  e2e-image-common-status:
+    needs: e2e-image-common
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check e2e-image-common result
+        run: |
+          result="${{ needs.e2e-image-common.result }}"
+          if [[ "$result" != "success" && "$result" != "skipped" ]]; then
+            echo "::error::e2e-image-common failed for at least one matrix image"
+            exit 1
+          fi
+
   e2e-image-router:
     needs: check-changes
     if: ${{ needs.check-changes.outputs.src == 'true' }}
@@ -306,6 +337,19 @@ jobs:
           retention-days: 1
           compression-level: 0
 
+  e2e-image-router-status:
+    needs: e2e-image-router
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check e2e-image-router result
+        run: |
+          result="${{ needs.e2e-image-router.result }}"
+          if [[ "$result" != "success" && "$result" != "skipped" ]]; then
+            echo "::error::e2e-image-router failed for at least one matrix image"
+            exit 1
+          fi
+
   e2e-router:
     needs:
       - check-changes
@@ -314,29 +358,6 @@ jobs:
     if: ${{ needs.check-changes.outputs.src == 'true' }}
     runs-on: ubuntu-latest
     timeout-minutes: 45
-    strategy:
-      fail-fast: false
-      matrix:
-        suite:
-          - name: pd
-            label-filter: "!Disruptive && !Extended && !SharedStorage && !Metrics"
-            needs-renderer: "false"
-          - name: pd-shared-storage-deprecated
-            label-filter: "SharedStorage && DeprecatedPD"
-            needs-renderer: "false"
-          - name: pd-shared-storage-disagg
-            label-filter: "SharedStorage && Disagg"
-            needs-renderer: "false"
-          - name: pd-metrics
-            label-filter: "Metrics"
-            needs-renderer: "false"
-          - name: extended
-            label-filter: "Extended"
-            needs-renderer: "true"
-          - name: disruption
-            label-filter: "Disruptive"
-            needs-renderer: "false"
-    name: e2e-router (${{ matrix.suite.name }})
     steps:
       - name: Checkout source
         uses: actions/checkout@v7
@@ -370,7 +391,6 @@ jobs:
           path: ${{ runner.temp }}/e2e-images
 
       - name: Download renderer image
-        if: ${{ matrix.suite.needs-renderer == 'true' }}
         uses: actions/download-artifact@v8
         with:
           name: e2e-image-renderer
@@ -383,13 +403,11 @@ jobs:
             docker load --input "$image"
           done
 
-      - name: Run e2e-router (${{ matrix.suite.name }})
+      - name: Run e2e-router
         shell: bash
         env:
           GO_MOD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-mod-cache }}
           GO_BUILD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-build-cache }}
-          E2E_LABEL_FILTER: ${{ matrix.suite.label-filter }}
-          LOAD_VLLM_RENDER_IMAGE: ${{ matrix.suite.needs-renderer }}
           PULL_VLLM_RENDER_IMAGE: "false"
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         run: make test-e2e-run

.github/workflows/ci-release.yaml

@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: go.mod