diff --git a/.github/actions/docker-build-and-push/action.yml b/.github/actions/docker-build-and-push/action.yml index fb8bf0c8c..d1ce56b72 100644 --- a/.github/actions/docker-build-and-push/action.yml +++ b/.github/actions/docker-build-and-push/action.yml @@ -10,9 +10,6 @@ inputs: 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) @@ -37,7 +34,6 @@ runs: 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 diff --git a/.github/workflows/ci-pr-checks.yaml b/.github/workflows/ci-pr-checks.yaml index 4550d6e95..b36a92739 100644 --- a/.github/workflows/ci-pr-checks.yaml +++ b/.github/workflows/ci-pr-checks.yaml @@ -25,11 +25,6 @@ jobs: 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/* - - name: go mod tidy run: go mod tidy diff --git a/.github/workflows/ci-push.yaml b/.github/workflows/ci-push.yaml deleted file mode 100644 index be3a09456..000000000 --- a/.github/workflows/ci-push.yaml +++ /dev/null @@ -1,48 +0,0 @@ -name: CI - Push - -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 }} diff --git a/.github/workflows/ci-release.yaml b/.github/workflows/ci-release.yaml index 41bb045d2..757b26302 100644 --- a/.github/workflows/ci-release.yaml +++ b/.github/workflows/ci-release.yaml @@ -42,7 +42,6 @@ jobs: 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 diff --git a/.version.json b/.version.json deleted file mode 100644 index 0f57d8d04..000000000 --- a/.version.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dev-version": "0.0.5", - "dev-registry": "ghcr.io/llm-d/llm-d-inference-scheduler-dev", - "prod-version": "0.0.4", - "prod-registry": "ghcr.io/llm-d/llm-d-inference-scheduler" -} diff --git a/Dockerfile b/Dockerfile index fd7cfb655..9c540af0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,11 +8,6 @@ RUN dnf install -y gcc-c++ libstdc++ libstdc++-devel clang && dnf clean all WORKDIR /workspace -## llm-d internal repos pull config -ARG KV_CACHE_MANAGER_TOKEN -RUN git config --global url."https://${KV_CACHE_MANAGER_TOKEN}@github.com/".insteadOf "https://github.com/" -ENV GOPRIVATE=github.com/llm-d/* - # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum diff --git a/Makefile b/Makefile index bda07582c..b916f0260 100644 --- a/Makefile +++ b/Makefile @@ -83,11 +83,6 @@ build: check-go download-tokenizer ## ##@ Container Build/Push .PHONY: buildah-build -buildah-build: check-builder load-version-json ## Build and push image (multi-arch if supported) - @echo "✅ Using builder: $(BUILDER)" -ifndef KV_CACHE_MANAGER_TOKEN - $(error "KV_CACHE_MANAGER_TOKEN is not set") -endif @if [ "$(BUILDER)" = "buildah" ]; then \ echo "🔧 Buildah detected: Performing multi-arch build..."; \ FINAL_TAG=$(IMG); \ @@ -96,7 +91,6 @@ endif echo "📦 Building for architecture: $$arch"; \ buildah build \ --arch=$$arch \ - --build-arg KV_CACHE_MANAGER_TOKEN=$(KV_CACHE_MANAGER_TOKEN) \ --os=linux \ --layers -t $(IMG)-$$arch . || exit 1; \ echo "🚀 Pushing image: $(IMG)-$$arch"; \ @@ -118,7 +112,6 @@ endif docker buildx use image-builder; \ docker buildx build --push \ --platform=$(PLATFORMS) \ - --build-arg KV_CACHE_MANAGER_TOKEN=$(KV_CACHE_MANAGER_TOKEN) \ --tag $(IMG) -f Dockerfile.cross . || exit 1; \ docker buildx rm image-builder || true; \ rm Dockerfile.cross; \ @@ -134,14 +127,10 @@ endif .PHONY: image-build image-build: check-container-tool load-version-json ## Build Docker image ## Build Docker image using $(CONTAINER_TOOL) @printf "\033[33;1m==== Building Docker image $(IMG) ====\033[0m\n" -ifndef KV_CACHE_MANAGER_TOKEN - $(error "KV_CACHE_MANAGER_TOKEN is not set") -endif $(CONTAINER_TOOL) build \ --platform $(TARGETOS)/$(TARGETARCH) \ --build-arg TARGETOS=$(TARGETOS) \ --build-arg TARGETARCH=$(TARGETARCH) \ - --build-arg KV_CACHE_MANAGER_TOKEN=$(KV_CACHE_MANAGER_TOKEN) \ -t $(IMG) . .PHONY: image-push diff --git a/go.mod b/go.mod index 26c8923ea..d9aa23457 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 github.com/hashicorp/golang-lru/v2 v2.0.7 - github.com/llm-d/llm-d-kv-cache-manager v0.0.0-20250515082302-b9deb04c44c5 + github.com/llm-d/llm-d-kv-cache-manager v0.1.0 github.com/prometheus/client_golang v1.22.0 github.com/stretchr/testify v1.10.0 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index 6c380dcac..9c8ceca87 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/llm-d/llm-d-kv-cache-manager v0.0.0-20250515082302-b9deb04c44c5 h1:BB02L+NP4zbsfZ23c5gCeKqxNTmArtzHYwiXIOr91mw= -github.com/llm-d/llm-d-kv-cache-manager v0.0.0-20250515082302-b9deb04c44c5/go.mod h1:Hu7RvpUg5sP1xnQFfO2dbt96AjGPWKuUvWBWiHj/FUU= +github.com/llm-d/llm-d-kv-cache-manager v0.1.0 h1:TabMsVni2AqxsfQtcT3jVjSPvExlbTieJejSVNwlkZ0= +github.com/llm-d/llm-d-kv-cache-manager v0.1.0/go.mod h1:Hu7RvpUg5sP1xnQFfO2dbt96AjGPWKuUvWBWiHj/FUU= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=