Merge remote-tracking branch 'origin/dev'

Author: clubanderson

.gitignore

@@ -7,6 +7,9 @@
 *.dll
 *.so
 *.dylib
+*.a
+main
+bin/
 
 # Test binary, built with `go test -c`
 *.test
@@ -21,4 +24,6 @@
 go.work
 go.work.sum
 
+# Environment Files
 .DS_Store
+.env

.golangci.yml

@@ -1,18 +1,33 @@
-# Refer to golangci-lint's example config file for more options and information:
-# https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
 version: "2"
 
 run:
   timeout: 5m
-  modules-download-mode: readonly
+  allow-parallel-runners: true
 
-linters:
+formatters:
   enable:
-    - errcheck
-    - govet
-    - staticcheck
+  - goimports
+  - gofmt
 
-issues:
-  exclude-use-default: false
-  max-issues-per-linter: 0
-  max-same-issues: 0
+linters:
+  enable:
+  - copyloopvar
+  - dupword
+  - durationcheck
+  - fatcontext
+  - ginkgolinter
+  - gocritic
+  - govet
+  - loggercheck
+  - misspell
+  - perfsprint
+  - revive
+  - unconvert
+  - makezero
+  - errcheck
+  - goconst
+  - ineffassign
+  - nakedret
+  - prealloc
+  - unparam
+  - unused

.tekton/buildah-build.yaml

@@ -16,6 +16,7 @@ spec:
     - name: registry
     - name: container-storage
       mountPath: /var/lib/containers
+    - name: git-auth
   steps:
     - name: build
       image: quay.io/buildah/stable:latest
@@ -34,7 +35,22 @@ spec:
         echo "🔧 IMAGE_TAG_BASE: $(params.image_tag_base)"
 
         echo "📦 Installing dependencies: make, jq..."
-        dnf install -y make jq && dnf clean all
+        dnf install -y make git jq && dnf clean all
+
+        echo "🔐 Extracting Git credentials from workspace..."
+        GIT_USER=$(cat /workspace/git-auth/username)
+        GIT_TOKEN=$(cat /workspace/git-auth/token)
+
+        if [ -z "$GIT_USER" ] || [ -z "$GIT_TOKEN" ]; then
+          echo "❌ Error: Missing git-auth credentials"
+          exit 1
+        fi
+
+        echo "🔐 Configuring Git..."
+        git config --global user.email "ci-tag-bot@example.com"
+        git config --global user.name "ci-tag-bot"
+        git config --global url."https://${GIT_USER}:${GIT_TOKEN}@github.com".insteadOf "https://github.com"
+        git config --global --add safe.directory "$(pwd)"
 
         echo "📁 Setting up registry credentials..."
         mkdir -p /root/.docker

.tekton/go-build-task.yaml

@@ -12,5 +12,24 @@ spec:
       script: |
         #!/bin/bash
         cd $(workspaces.source.path)
+        
+        echo "🔐 Extracting Git credentials from workspace..."
+        GIT_USER=$(cat /workspace/git-auth/username)
+        GIT_TOKEN=$(cat /workspace/git-auth/token)
+
+        if [ -z "$GIT_USER" ] || [ -z "$GIT_TOKEN" ]; then
+          echo "❌ Error: Missing git-auth credentials"
+          exit 1
+        fi
+
+        echo "🔐 Configuring Git..."
+        git config --global user.email "ci-tag-bot@example.com"
+        git config --global user.name "ci-tag-bot"
+        git config --global url."https://${GIT_USER}:${GIT_TOKEN}@github.com".insteadOf "https://github.com"
+        git config --global --add safe.directory "$(pwd)"
+
+        # required for go build with tokenizer lib linking
+        dnf install -y gcc-c++ libstdc++ libstdc++-devel && dnf clean all
+        
         go env -w GOFLAGS=-buildvcs=false
         make build

.tekton/go-lint-task.yaml

@@ -19,6 +19,21 @@ spec:
         echo "Running golangci-lint..."
         cd $(workspaces.source.path)
 
+        echo "🔐 Extracting Git credentials from workspace..."
+        GIT_USER=$(cat /workspace/git-auth/username)
+        GIT_TOKEN=$(cat /workspace/git-auth/token)
+
+        if [ -z "$GIT_USER" ] || [ -z "$GIT_TOKEN" ]; then
+          echo "❌ Error: Missing git-auth credentials"
+          exit 1
+        fi
+
+        echo "🔐 Configuring Git..."
+        git config --global user.email "ci-tag-bot@example.com"
+        git config --global user.name "ci-tag-bot"
+        git config --global url."https://${GIT_USER}:${GIT_TOKEN}@github.com".insteadOf "https://github.com"
+        git config --global --add safe.directory "$(pwd)"
+        
         # Verify config file exists
         if [ -f .golangci.yml ] || [ -f .golangci.yaml ] || [ -f .golangci.toml ]; then
           echo "✅ Found golangci-lint config file"

.tekton/go-test-task.yaml

@@ -18,5 +18,24 @@ spec:
         ginkgo version
         cd $(workspaces.source.path)
         echo "Running tests with Ginkgo..."
+        
+        echo "🔐 Extracting Git credentials from workspace..."
+        GIT_USER=$(cat /workspace/git-auth/username)
+        GIT_TOKEN=$(cat /workspace/git-auth/token)
+
+        if [ -z "$GIT_USER" ] || [ -z "$GIT_TOKEN" ]; then
+          echo "❌ Error: Missing git-auth credentials"
+          exit 1
+        fi
+
+        echo "🔐 Configuring Git..."
+        git config --global user.email "ci-tag-bot@example.com"
+        git config --global user.name "ci-tag-bot"
+        git config --global url."https://${GIT_USER}:${GIT_TOKEN}@github.com".insteadOf "https://github.com"
+        git config --global --add safe.directory "$(pwd)"
+        
+        # required for go build with tokenizer lib linking
+        dnf install -y gcc-c++ libstdc++ libstdc++-devel && dnf clean all
+        
         go env -w GOFLAGS=-buildvcs=false
         make test

.tekton/pipelinerun.yaml

@@ -19,6 +19,8 @@ spec:
       fsGroup: 0
     imagePullSecrets:
       - name: icr-secret
+    nodeSelector:
+      nvidia.com/gpu.product: "none"   # Ensures tasks run on non-GPU nodes
   params:
     - name: runOptional
       value: "true"
@@ -133,6 +135,8 @@ spec:
         workspaces:
           - name: source
             workspace: source
+          - name: git-auth
+            workspace: git-auth
 
       - name: go-test
         when:
@@ -149,6 +153,8 @@ spec:
         workspaces:
           - name: source
             workspace: source
+          - name: git-auth
+            workspace: git-auth
 
       - name: go-build
         when:
@@ -165,6 +171,8 @@ spec:
         workspaces:
           - name: source
             workspace: source
+          - name: git-auth
+            workspace: git-auth
 
       - name: extract-version-and-registry
         params:
@@ -328,6 +336,8 @@ spec:
             workspace: registry-secret
           - name: container-storage
             workspace: container-storage
+          - name: git-auth
+            workspace: git-auth
 
       - name: vulnerability-scan
         when:

Dockerfile

@@ -3,34 +3,54 @@ FROM quay.io/projectquay/golang:1.24 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
-ENV GOPROXY=https://goproxy.io,direct
+# Install build tools
+RUN dnf install -y gcc-c++ libstdc++ libstdc++-devel && dnf clean all
 
 WORKDIR /workspace
+
+## NeuralMagic internal repos pull config
+ARG GIT_NM_USER
+ARG NM_TOKEN
+### use git token
+RUN echo -e "machine github.com\n\tlogin ${GIT_NM_USER}\n\tpassword ${NM_TOKEN}" >> ~/.netrc
+ENV GOPRIVATE=github.com/neuralmagic
+ENV GIT_TERMINAL_PROMPT=1
+
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
 
 # Copy the go source
-COPY cmd/llm-d-inference-scheduler/main.go cmd/cmd.go
-COPY hello/ hello/
+COPY cmd/ cmd/
+COPY pkg/ pkg/
+COPY internal/ internal/
+
+# HuggingFace tokenizer bindings
+RUN mkdir -p lib
+RUN curl -L https://github.com/daulet/tokenizers/releases/download/v1.20.2/libtokenizers.${TARGETOS}-${TARGETARCH}.tar.gz | tar -xz -C lib
+RUN ranlib lib/*.a
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
 # was called. For example, if we call make image-build in a local env which has the Apple Silicon M1 SO
 # the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o bin/llm-d-inference-scheduler cmd/cmd.go
+ENV CGO_ENABLED=1
+ENV GOOS=${TARGETOS:-linux}
+ENV GOARCH=${TARGETARCH}
+RUN go build -a -o bin/epp -ldflags="-extldflags '-L$(pwd)/lib'" cmd/epp/main.go cmd/epp/health.go
+RUN rm -rf ~/.netrc # remove git token
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM registry.access.redhat.com/ubi9/ubi:latest
 WORKDIR /
-COPY --from=builder /workspace/bin/llm-d-inference-scheduler /app/llm-d-inference-scheduler
+COPY --from=builder /workspace/bin/epp /app/epp
 USER 65532:65532
 
-CMD ["sleep", "infinity"]
-
+# expose gRPC, health and metrics ports
+EXPOSE 9002
+EXPOSE 9003
+EXPOSE 9090
 
+ENTRYPOINT ["/app/epp"]