Skip to content

Commit 9fd93a1

Browse files
authored
Merge branch 'main' into add-file
Signed-off-by: Huamin Chen <[email protected]>
2 parents be3eb61 + f203719 commit 9fd93a1

File tree

304 files changed

+39933
-22825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+39933
-22825
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Feature Request
2+
description: Feature request
3+
labels: ["feature request"]
4+
title: "feature: <title>"
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this feature request!
10+
- type: textarea
11+
attributes:
12+
label: Describe the feature
13+
description: A clear and concise description of what the feature is.
14+
validations:
15+
required: true
16+
- type: textarea
17+
attributes:
18+
label: Why do you need this feature?
19+
description: A clear and concise description of why you need this feature.
20+
validations:
21+
required: false
22+
- type: textarea
23+
attributes:
24+
label: Additional context
25+
description: Add any other context about the problem here.
26+
validations:
27+
required: false
28+
- type: markdown
29+
attributes:
30+
value: |
31+
Love this enhancement proposal? Give it a 👍. We prioritise the proposals with the most 👍.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Bug Report
2+
description: Bug report
3+
labels: ["bug"]
4+
title: "bug: <title>"
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
- type: textarea
11+
attributes:
12+
label: Describe the bug
13+
description: A clear and concise description of what the bug is.
14+
validations:
15+
required: true
16+
- type: textarea
17+
attributes:
18+
label: To Reproduce
19+
description: Steps to reproduce the behavior.
20+
validations:
21+
required: true
22+
- type: textarea
23+
attributes:
24+
label: Expected behavior
25+
description: A clear and concise description of what you expected to happen.
26+
validations:
27+
required: false
28+
- type: textarea
29+
attributes:
30+
label: Additional context
31+
description: Add any other context about the problem here.
32+
validations:
33+
required: false
34+
- type: markdown
35+
attributes:
36+
value: |
37+
Impacted by this bug? Give it a 👍. We prioritise the issues with the most 👍.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
blank_issues_enabled: true
2+
3+
contact_links:
4+
- name: Have you read the tutorials?
5+
url: https://vllm-semantic-router.com
6+
about: Much help can be found in the docs
7+
- name: Chat on Slack
8+
url: https://slack.vllm.ai/
9+
about: Maybe chatting with the community can help @semantic-router channel

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
1-
**What type of PR is this?**
2-
<!--
3-
Your PR title should be descriptive, and generally start with type that contains a subsystem name with `()` if necessary
4-
and summary followed by a colon. format `chore/docs/api/feat/fix/refactor/style/test: summary`.
5-
Examples:
6-
* "docs: fix grammar error"
7-
* "feat(translator): add new feature"
8-
* "fix: fix xx bug"
9-
* "chore: change ci & build tools etc"
10-
* "api: add xxx fields in ClientTrafficPolicy"
11-
-->
12-
13-
<!--
14-
NOTE: If your PR contains any API changes (changes under `/api`), we recommend you to separate these API changes into
15-
a new PR, and we will review the API part first. It will save you lots of implementation time if the API get accepted.
16-
-->
17-
18-
**What this PR does / why we need it**:
19-
20-
**Which issue(s) this PR fixes**:
21-
<!--
22-
*Automatically closes linked issue when PR is merged.
23-
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
24-
-->
25-
Fixes #
26-
27-
<!--
28-
For any non-trivial changes, you need to provide a brief description of the changes in the release notes.
29-
-->
30-
Release Notes: Yes/No
1+
FILL IN THE PR DESCRIPTION HERE
2+
3+
FIX #xxxx (*link existing issues this PR will resolve*)
4+
5+
**BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE**
6+
7+
---
8+
9+
- [ ] Make sure the code changes pass the [pre-commit](https://github.com/vllm-project/semantic-router/blob/main/CONTRIBUTING.md) checks.
10+
- [ ] Sign-off your commit by using <code>-s</code> when doing <code>git commit</code>
11+
- [ ] Try to classify PRs for easy understanding of the type of changes, such as `[Bugfix]`, `[Feat]`, and `[CI]`.
12+
13+
<details>
14+
<!-- inside this <details> section, markdown rendering does not work, so we use raw html here. -->
15+
<summary><b> Detailed Checklist (Click to Expand) </b></summary>
16+
17+
<p>Thank you for your contribution to semantic-router! Before submitting the pull request, please ensure the PR meets the following criteria. This helps us maintain the code quality and improve the efficiency of the review process.</p>
18+
19+
<h3>PR Title and Classification</h3>
20+
<p>Please try to classify PRs for easy understanding of the type of changes. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:</p>
21+
<ul>
22+
<li><code>[Bugfix]</code> for bug fixes.</li>
23+
<li><code>[CI/Build]</code> for build or continuous integration improvements.</li>
24+
<li><code>[Doc]</code> for documentation fixes and improvements.</li>
25+
<li><code>[Feat]</code> for new features in the cluster (e.g., autoscaling, disaggregated prefill, etc.).</li>
26+
<li><code>[Router]</code> for changes to the <code>vllm_router</code> (e.g., routing algorithm, router observability, etc.).</li>
27+
<li><code>[Misc]</code> for PRs that do not fit the above categories. Please use this sparingly.</li>
28+
</ul>
29+
<p><strong>Note:</strong> If the PR spans more than one category, please include all relevant prefixes.</p>
30+
31+
<h3>Code Quality</h3>
32+
33+
<p>The PR need to meet the following code quality standards:</p>
34+
35+
<ul>
36+
<li>Pass all linter checks. Please use <code>pre-commit</code> to format your code. See <code>README.md</code> for installation.</li>
37+
<li>The code need to be well-documented to ensure future contributors can easily understand the code.</li>
38+
<li> Please include sufficient tests to ensure the change is stay correct and robust. This includes both unit tests and integration tests.</li>
39+
</ul>
40+
41+
<h3>DCO and Signed-off-by</h3>
42+
<p>When contributing changes to this project, you must agree to the <a href="https://github.com/vllm-project/vllm/blob/main/DCO">DCO</a>. Commits must include a <code>Signed-off-by:</code> header which certifies agreement with the terms of the DCO.</p>
43+
<p>Using <code>-s</code> with <code>git commit</code> will automatically add this header.</p>
44+
45+
<h3>What to Expect for the Reviews</h3>

.github/workflows/k8s-config-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Test kustomize with different overlays
2828
run: |
2929
echo "Testing base kustomization..."
30-
kustomize build deploy/kubernetes > /tmp/base-manifests.yaml
30+
kustomize build deploy/kubernetes/ai-gateway/semantic-router > /tmp/base-manifests.yaml
3131
3232
echo "Validating generated resources..."
3333
@@ -57,22 +57,22 @@ jobs:
5757
- name: Verify ConfigMap generation
5858
run: |
5959
echo "Checking ConfigMap generation..."
60-
kustomize build deploy/kubernetes | grep -A 20 "kind: ConfigMap"
60+
kustomize build deploy/kubernetes/ai-gateway/semantic-router | grep -A 20 "kind: ConfigMap"
6161
6262
# Verify config files are included
63-
if ! kustomize build deploy/kubernetes | grep -q "config.yaml"; then
63+
if ! kustomize build deploy/kubernetes/ai-gateway/semantic-router | grep -q "config.yaml"; then
6464
echo "Warning: config.yaml might not be properly included in ConfigMap"
6565
fi
6666
67-
if ! kustomize build deploy/kubernetes | grep -q "tools_db.json"; then
67+
if ! kustomize build deploy/kubernetes/ai-gateway/semantic-router | grep -q "tools_db.json"; then
6868
echo "Warning: tools_db.json might not be properly included in ConfigMap"
6969
fi
7070
7171
- name: Validate observability kustomization
7272
run: |
7373
echo "Validating observability stack kustomization..."
74-
if [ -d "deploy/kubernetes/observability" ]; then
75-
kustomize build deploy/kubernetes/observability > /tmp/observability-manifests.yaml
74+
if [ -d "deploy/kubernetes/ai-gateway/semantic-router/observability" ]; then
75+
kustomize build deploy/kubernetes/ai-gateway/semantic-router/observability > /tmp/observability-manifests.yaml
7676
echo "✓ Observability kustomization is valid"
7777
7878
# Verify expected resources
@@ -90,9 +90,9 @@ jobs:
9090
echo "Validating AI Gateway configurations..."
9191
9292
# Check if ai-gateway directory exists
93-
if [ -d "deploy/kubernetes/ai-gateway" ]; then
93+
if [ -d "deploy/kubernetes/ai-gateway/semantic-router/ai-gateway" ]; then
9494
# Validate configuration yamls (without CRDs)
95-
for yaml_file in deploy/kubernetes/ai-gateway/configuration/*.yaml; do
95+
for yaml_file in deploy/kubernetes/ai-gateway/semantic-router/ai-gateway/configuration/*.yaml; do
9696
if [ -f "$yaml_file" ]; then
9797
echo "Checking $yaml_file..."
9898
# Basic YAML syntax check
@@ -101,7 +101,7 @@ jobs:
101101
done
102102
103103
# Validate inference-pool manifests (skip CRD validation as they may not be installed)
104-
for yaml_file in deploy/kubernetes/ai-gateway/inference-pool/*.yaml; do
104+
for yaml_file in deploy/kubernetes/ai-gateway/semantic-router/ai-gateway/inference-pool/*.yaml; do
105105
if [ -f "$yaml_file" ]; then
106106
echo "Checking $yaml_file for YAML syntax..."
107107
# Just check if it's valid YAML

.github/workflows/k8s-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ name: Kubernetes Integration Test
2626
on:
2727
pull_request:
2828
paths:
29-
- "deploy/kubernetes/**"
29+
- "deploy/kubernetes/ai-gateway/semantic-router/**"
3030
- ".github/workflows/k8s-integration-test*.yml"
3131
- "Dockerfile.extproc"
3232
- "tools/kind/**"

.github/workflows/k8s-kind-integration-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
echo "Preparing CI deployment configuration..."
139139
140140
# Create a temporary kustomization file for CI
141-
cd deploy/kubernetes
141+
cd deploy/kubernetes/ai-gateway/semantic-router
142142
143143
# Backup original kustomization.yaml
144144
cp kustomization.yaml kustomization.yaml.backup
@@ -241,7 +241,7 @@ jobs:
241241
- name: Deploy to kind cluster
242242
run: |
243243
echo "Deploying semantic-router to kind cluster..."
244-
kustomize build deploy/kubernetes | kubectl apply -f -
244+
kustomize build deploy/kubernetes/ai-gateway/semantic-router | kubectl apply -f -
245245
246246
echo "Waiting for namespace to be active..."
247247
kubectl wait --for=jsonpath='{.status.phase}'=Active namespace/vllm-semantic-router-system --timeout=60s
@@ -394,7 +394,7 @@ jobs:
394394
echo "Cleaning up kind cluster..."
395395
kind delete cluster --name semantic-router-cluster || true
396396
echo "Restoring original kustomization..."
397-
cd deploy/kubernetes
397+
cd deploy/kubernetes/ai-gateway/semantic-router
398398
if [ -f kustomization.yaml.backup ]; then
399399
mv kustomization.yaml.backup kustomization.yaml
400400
fi

.github/workflows/k8s-security-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: aquasecurity/trivy-action@master
2929
with:
3030
scan-type: "config"
31-
scan-ref: "deploy/kubernetes"
31+
scan-ref: "deploy/kubernetes/ai-gateway/semantic-router"
3232
format: "sarif"
3333
output: "trivy-results.sarif"
3434
severity: "CRITICAL,HIGH"
@@ -43,7 +43,7 @@ jobs:
4343
- name: Run Checkov scan
4444
uses: bridgecrewio/checkov-action@master
4545
with:
46-
directory: deploy/kubernetes
46+
directory: deploy/kubernetes/ai-gateway/semantic-router
4747
framework: kubernetes
4848
output_format: cli
4949
soft_fail: true # Don't fail the build

0 commit comments

Comments
 (0)