Merge pull request #59 from opendatahub-io/sync-upstream

Sync main with 'upstream/main'

Author: vishbhat

.github/workflows/ci-integration-tests.yml

@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   integration-tests:
-    name: Integration Tests (${{ matrix.file_client_type }}, ${{ matrix.db_client_type }}, ${{ matrix.exchange_client_type }})
+    name: Integration Tests (${{ matrix.file_client_type }}, ${{ matrix.db_client_type }}, ${{ matrix.exchange_client_type }}${{ matrix.enable_gie == 'true' && ', gie' || '' }})
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
@@ -41,6 +41,10 @@ jobs:
           - file_client_type: s3
             db_client_type: valkey
             exchange_client_type: valkey
+          - file_client_type: s3
+            db_client_type: postgresql
+            exchange_client_type: redis
+            enable_gie: "true"
     steps:
       - uses: actions/checkout@v6
 
@@ -60,6 +64,7 @@ jobs:
           FILE_CLIENT_TYPE: ${{ matrix.file_client_type }}
           DB_CLIENT_TYPE: ${{ matrix.db_client_type }}
           EXCHANGE_CLIENT_TYPE: ${{ matrix.exchange_client_type }}
+          ENABLE_GIE: ${{ matrix.enable_gie || 'false' }}
 
       - name: Run integration tests
         run: make test-e2e

.github/workflows/ci-signed-commits.yml

@@ -3,7 +3,7 @@ on: pull_request_target
 
 jobs:
   signed-commits:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-signed-commits.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-signed-commits.yaml@main
     permissions:
       contents: read
       pull-requests: write

.github/workflows/non-main-gatekeeper.yml

@@ -9,4 +9,4 @@ permissions:
 
 jobs:
   gatekeeper:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-non-main-gatekeeper.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-non-main-gatekeeper.yaml@main

.github/workflows/pre-commit.yml

@@ -28,6 +28,9 @@ jobs:
           go-version-file: go.mod
           cache: true
 
+      - name: Install Helm
+        uses: azure/setup-helm@v5
+
       - name: Install Go tools (goimports, gosec, ruleguard)
         run: make install-pre-commit-tools
 
@@ -38,3 +41,6 @@ jobs:
 
       - name: Run pre-commit hooks
         uses: pre-commit/action@v3.0.1
+
+      - name: Lint Helm chart
+        run: helm lint charts/batch-gateway

.github/workflows/prow-github.yml

@@ -9,4 +9,4 @@ permissions:
 
 jobs:
   prow:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-commands.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-commands.yaml@main

.github/workflows/prow-pr-automerge.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   auto-merge:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-automerge.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-automerge.yaml@main

.github/workflows/prow-pr-remove-lgtm.yml

@@ -6,4 +6,4 @@ permissions:
 
 jobs:
   remove-lgtm:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-remove-lgtm.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-prow-remove-lgtm.yaml@main

.github/workflows/stale.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   stale:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-stale.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-stale.yaml@main
     permissions:
       issues: write
       pull-requests: write

.github/workflows/unstale.yml

@@ -7,6 +7,6 @@ on:
 
 jobs:
   unstale:
-    uses: llm-d/llm-d-infra/.github/workflows/reusable-unstale.yml@main
+    uses: llm-d/llm-d-infra/.github/workflows/reusable-unstale.yaml@main
     permissions:
       issues: write

Makefile

@@ -233,8 +233,7 @@ install-pre-commit-tools:
 	$(GO) install github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.4.5
 	@if command -v helm >/dev/null 2>&1; then \
 		helm plugin list | grep -q unittest || \
-			helm plugin install https://github.com/helm-unittest/helm-unittest.git || \
-			helm plugin install --verify=false https://github.com/helm-unittest/helm-unittest.git; \
+			helm plugin install --verify=false --version v1.0.3 https://github.com/helm-unittest/helm-unittest.git; \
 	else \
 		echo "helm not found, skipping helm-unittest plugin install"; \
 	fi
@@ -327,6 +326,10 @@ KIND_CLUSTER_NAME ?= batch-gateway-dev
 dev-deploy:
 	@bash scripts/dev-deploy.sh
 
+## dev-deploy-gie: Deploy with GIE integration (per-model EPP + InferenceObjectives)
+dev-deploy-gie:
+	@ENABLE_GIE=true bash scripts/dev-deploy.sh
+
 ## dev-clean: Clean up dev deployment (removes all resources but keeps the kind cluster)
 dev-clean:
 	@bash scripts/dev-clean.sh