-
Notifications
You must be signed in to change notification settings - Fork 135
Merge Dev #96
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merge Dev #96
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
4295230
Updated scheduler configuration process to include upstream plugins a…
shmuelk 365e5b6
chore: add healthcheck workaround (#93)
shaneutt 93d640c
in case when both pd and decode prefix scorer are disabled - don't in…
mayabar 4a8733f
Merge pull request #94 from mayabar/pd-disabled-fix
vMaroon 3d81046
bump upstream import version
vMaroon 06eec76
piggyback a CI fix
vMaroon 0696ee4
Merge pull request #95 from llm-d/upstream-bump
clubanderson 2707830
add implementation of OnResponse + fix in session aware scorer
mayabar 6e05d66
fix post response ofsession aware scorer
mayabar 6a1d726
Merge pull request #98 from mayabar/post-response-fix
vMaroon 58d5f43
switch from tekton to github actions - initial commit
vMaroon c8dc877
add dev to PR trigger
vMaroon 71df423
use token to get private llm-d kv-cache module
vMaroon 7ac953d
set GOPRIVATE to llm-d org
vMaroon c06a1a1
go mod tidy
vMaroon faa7d9e
add a build step in PR GHA check
vMaroon 26fd99a
remove redundant line
vMaroon d82a443
add image-build on merge github workflow
vMaroon 1a10d65
temporarily build dev from any ref
vMaroon 7d38ca7
fix private pull in GHA merge
vMaroon ed487af
Merge pull request #103 from llm-d/gha-merge
clubanderson 8b6b9c6
fix gha image build on merge
vMaroon 4c7c872
fix gha image build and push on CI-push
vMaroon 78b1d55
fix gha image push on CI-push
vMaroon 96c2d3f
remove PR trigger from ci-push after testing
vMaroon 119e383
Update .github/workflows/ci-pr-checks.yaml
vMaroon c9e6007
address PR commits
vMaroon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: Docker Build - ghcr | ||
| description: Build image using buildx | ||
| inputs: | ||
| image-name: | ||
| required: true | ||
| description: Image name | ||
| tag: | ||
| required: true | ||
| description: Image tag | ||
| github-token: | ||
| required: true | ||
| description: GitHub token for login | ||
| kv-cache-manager-token: | ||
| required: true | ||
| description: KV Cache Manager llm-d repo token | ||
| registry: | ||
| required: true | ||
| description: Container registry (e.g., ghcr.io/llm-d) | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Login to GitHub Container Registry | ||
| run: echo "${{ inputs.github-token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin | ||
| shell: bash | ||
|
|
||
| - name: Print image info | ||
| run: | | ||
| echo "Image name: ${{ inputs.image-name }}" | ||
| echo "Tag: ${{ inputs.tag }}" | ||
| echo "Registry: ${{ inputs.registry }}" | ||
| shell: bash | ||
|
|
||
| - name: Build image and push | ||
| run: | | ||
| docker buildx build \ | ||
| --platform linux/amd64 \ | ||
| --build-arg KV_CACHE_MANAGER_TOKEN=${{ inputs.kv-cache-manager-token }} \ | ||
| -t ${{ inputs.registry }}/${{ inputs.image-name }}:${{ inputs.tag }} \ | ||
| --push . | ||
| shell: bash | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name: Trivy Scan | ||
| description: Scan container image with Trivy | ||
| inputs: | ||
| image: | ||
| required: true | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Install Trivy | ||
| run: | | ||
| wget https://github.com/aquasecurity/trivy/releases/download/v0.44.1/trivy_0.44.1_Linux-64bit.deb | ||
| sudo dpkg -i trivy_0.44.1_Linux-64bit.deb | ||
| shell: bash | ||
|
|
||
|
|
||
| - name: Scan image | ||
| run: | | ||
| trivy image --severity HIGH,CRITICAL --no-progress ${{ inputs.image }} | ||
vMaroon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| shell: bash | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| name: CI - PR Checks | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - dev | ||
| - main | ||
|
|
||
| jobs: | ||
| lint-and-test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Sanity check repo contents | ||
| run: ls -la | ||
vMaroon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| - name: Extract Go version from go.mod | ||
| run: sed -En 's/^go (.*)$/GO_VERSION=\1/p' go.mod >> $GITHUB_ENV | ||
|
|
||
| - name: Set up Go with cache | ||
| uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: "${{ env.GO_VERSION }}" | ||
| cache-dependency-path: ./go.sum | ||
|
|
||
| - name: Configure Git to use token for private modules | ||
| run: | | ||
| git config --global url."https://${{ secrets.KV_CACHE_MANAGER_TOKEN }}@github.com/".insteadOf "https://github.com/" | ||
| go env -w GOPRIVATE=github.com/llm-d/* | ||
vMaroon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| - name: go mod tidy | ||
| run: go mod tidy | ||
|
|
||
| - name: Run lint checks | ||
| uses: golangci/golangci-lint-action@v8 | ||
| with: | ||
| version: 'v2.1.6' | ||
| args: "--config=./.golangci.yml" | ||
|
|
||
| - name: Run make test | ||
| shell: bash | ||
| run: | | ||
| make test | ||
|
|
||
| - name: Run make build | ||
| shell: bash | ||
| run: | | ||
| make build | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: CI - Push | ||
elevran marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - dev | ||
| - main | ||
|
|
||
| jobs: | ||
| docker-build-and-push: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Load version information | ||
| id: version | ||
| run: | | ||
| repo="${GITHUB_REPOSITORY##*/}" | ||
| VERSION_FILE=".version.json" | ||
| dev_version=$(jq -r '.["dev-version"]' "$VERSION_FILE") | ||
| prod_version=$(jq -r '.["prod-version"]' "$VERSION_FILE") | ||
|
|
||
| if [[ "${GITHUB_REF_NAME}" == "dev" ]]; then | ||
| echo "tag=$dev_version" >> "$GITHUB_OUTPUT" | ||
| echo "project_name=$repo-dev" >> "$GITHUB_OUTPUT" | ||
| elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then | ||
| echo "tag=$prod_version" >> "$GITHUB_OUTPUT" | ||
| echo "project_name=$repo" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "tag=$dev_version" >> "$GITHUB_OUTPUT" | ||
| echo "project_name=$repo-dev" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| shell: bash | ||
|
|
||
| - name: Print project name and tag | ||
| run: | | ||
| echo "Project is ${{ steps.version.outputs.project_name }}" | ||
| echo "Tag is ${{ steps.version.outputs.tag }}" | ||
|
|
||
| - name: Build and push image | ||
| uses: ./.github/actions/docker-build-and-push | ||
| with: | ||
| tag: ${{ steps.version.outputs.tag }} | ||
| image-name: ${{ steps.version.outputs.project_name }} | ||
| registry: ghcr.io/llm-d | ||
| github-token: ${{ secrets.GHCR_TOKEN }} | ||
| kv-cache-manager-token: ${{ secrets.KV_CACHE_MANAGER_TOKEN }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| name: CI - Release - Docker Container Image | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - 'v*' # Runs when a tag like v0.1.0 is pushed | ||
| release: | ||
| types: [published] # Also runs when a GitHub release is published | ||
|
|
||
| jobs: | ||
| docker-build-and-push: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set project name from repository | ||
| id: version | ||
| run: | | ||
| repo="${GITHUB_REPOSITORY##*/}" | ||
| echo "project_name=$repo" >> "$GITHUB_OUTPUT" | ||
|
|
||
| - name: Print project name | ||
| run: echo "Project is ${{ steps.version.outputs.project_name }}" | ||
|
|
||
| - name: Determine tag name | ||
| id: tag | ||
| run: | | ||
| if [[ "${GITHUB_EVENT_NAME}" == "release" ]]; then | ||
| echo "tag=${GITHUB_REF##refs/tags/}" >> "$GITHUB_OUTPUT" | ||
| elif [[ "${GITHUB_REF}" == refs/tags/* ]]; then | ||
| echo "tag=${GITHUB_REF##refs/tags/}" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "tag=latest" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| shell: bash | ||
|
|
||
| - name: Build and push image | ||
| uses: ./.github/actions/docker-build-and-push | ||
| with: | ||
| tag: ${{ steps.tag.outputs.tag }} | ||
| image-name: ${{ steps.version.outputs.project_name }} | ||
| registry: ghcr.io/llm-d | ||
| github-token: ${{ secrets.GHCR_TOKEN }} | ||
| kv-cache-manager-token: ${{ secrets.KV_CACHE_MANAGER_TOKEN }} | ||
|
|
||
| - name: Run Trivy scan | ||
| uses: ./.github/actions/trivy-scan | ||
| with: | ||
| image: ghcr.io/llm-d/${{ steps.version.outputs.project_name }}:${{ steps.tag.outputs.tag }} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.