Skip to content

Commit c84fae3

Browse files
committed
Merge branch 'main' into conformance
2 parents d1c561f + a54c51b commit c84fae3

File tree

119 files changed

+2171
-816
lines changed

Some content is hidden

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

119 files changed

+2171
-816
lines changed

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ IMAGE_NAME := epp
3535
IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_NAME)
3636
IMAGE_TAG ?= $(IMAGE_REPO):$(GIT_TAG)
3737
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
38-
E2E_MANIFEST_PATH ?= config/manifests/vllm/gpu-deployment.yaml
38+
# The path to the E2E manifest file. It can be overridden by setting the
39+
# E2E_MANIFEST_PATH environment variable. Note that HF_TOKEN must be set when using the GPU-based manifest.
40+
E2E_MANIFEST_PATH ?= config/manifests/vllm/sim-deployment.yaml
3941

4042
SYNCER_IMAGE_NAME := lora-syncer
4143
SYNCER_IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(SYNCER_IMAGE_NAME)
@@ -92,7 +94,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
9294

9395
.PHONY: generate
9496
generate: controller-gen code-generator manifests ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
95-
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
97+
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate/boilerplate.generatego.txt" paths="./..."
9698
./hack/update-codegen.sh
9799

98100
# Use same code-generator version as k8s.io/api
@@ -151,9 +153,14 @@ ci-lint: golangci-lint
151153
$(GOLANGCI_LINT) run --timeout 15m0s
152154

153155
.PHONY: verify
154-
verify: vet fmt-verify manifests generate ci-lint
156+
verify: vet fmt-verify manifests generate ci-lint verify-all
155157
git --no-pager diff --exit-code config api client-go
156158

159+
# Run static analysis.
160+
.PHONY: verify-all
161+
verify-all:
162+
hack/verify-all.sh -v
163+
157164
##@ Build
158165

159166
# Build the container image
@@ -300,7 +307,6 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
300307
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
301308
$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
302309

303-
304310
##@ Helm
305311
PHONY: inferencepool-helm-chart-push
306312
inferencepool-helm-chart-push: yq helm

api/v1alpha2/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1alpha2/zz_generated.register.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/endpointpickerconfig.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/extension.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/extensionconnection.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/extensionreference.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/inferencemodel.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/inferencemodelspec.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-go/applyconfiguration/api/v1alpha2/inferencemodelstatus.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)