Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
82ad60a
rename x-k8s to apix and add v1 InferencePool to api/v1
capri-xiyue Jul 7, 2025
0904783
changed epp and conformance test to support v1
capri-xiyue Jul 7, 2025
e06ee8f
fixed duplicate import
capri-xiyue Jul 7, 2025
774a124
changed docker file
capri-xiyue Jul 7, 2025
98707cd
fixed naming collision
capri-xiyue Jul 8, 2025
5d4425a
added fake approved annotation
capri-xiyue Jul 8, 2025
40bdc89
try to fix unit tests
capri-xiyue Jul 8, 2025
33c053c
fixed typo
capri-xiyue Jul 8, 2025
fb64679
added annotation
capri-xiyue Jul 8, 2025
046f686
fixed annotation
capri-xiyue Jul 8, 2025
0056e90
fixed e2e test
capri-xiyue Jul 8, 2025
4202df8
change manifests
capri-xiyue Jul 8, 2025
42bcfcd
added rbac
capri-xiyue Jul 11, 2025
8b19b15
Update api/v1/inferencepool_types.go
capri-xiyue Jul 11, 2025
80ad4a9
Apply suggestions from code review
capri-xiyue Jul 11, 2025
fac46d6
use v1 type in v1alpha2
capri-xiyue Jul 11, 2025
3276358
clean unused depdendency
capri-xiyue Jul 11, 2025
fddab55
fixed code generator error
capri-xiyue Jul 11, 2025
dacadb0
revert back
capri-xiyue Jul 11, 2025
b5b2f39
merge bob's change
capri-xiyue Jul 11, 2025
4d75156
upadted code-gen
capri-xiyue Jul 11, 2025
8c034b1
remove deep copy needs
capri-xiyue Jul 11, 2025
58ec653
use codegen
capri-xiyue Jul 11, 2025
c42d7dc
tried all alias
capri-xiyue Jul 11, 2025
c276745
push local changes
capri-xiyue Jul 11, 2025
497e95b
changed inferencepoollist not to use v1.InferencePoolList
capri-xiyue Jul 11, 2025
ab5587c
changed comments
capri-xiyue Jul 11, 2025
1bab83f
fixed presubmit
capri-xiyue Jul 11, 2025
290344d
change to v1 ip
capri-xiyue Jul 11, 2025
478ea68
revert to corev1 objectreference
capri-xiyue Jul 11, 2025
3cc5235
revert back to corev1 objectreference
capri-xiyue Jul 11, 2025
6f56fc7
change crd
capri-xiyue Jul 11, 2025
4ea546b
remove crd
capri-xiyue Jul 11, 2025
01fd091
manually add x-k8s.io inferencepool
capri-xiyue Jul 11, 2025
208d707
revert crd
capri-xiyue Jul 12, 2025
952d3fb
Revert "added rbac"
capri-xiyue Jul 12, 2025
5a35782
revert to workable version
capri-xiyue Jul 12, 2025
1ed4e73
run generator
capri-xiyue Jul 12, 2025
a2c06d8
re-run generate
capri-xiyue Jul 12, 2025
c7cdb71
revert to workable
capri-xiyue Jul 12, 2025
ccb2ef6
revert to workable version
capri-xiyue Jul 12, 2025
2d560ac
fixed test
capri-xiyue Jul 12, 2025
113fec6
change to non-duplicate type
capri-xiyue Jul 12, 2025
3d72665
test
capri-xiyue Jul 12, 2025
75e3d95
revert it back to originall workable version
capri-xiyue Jul 12, 2025
aa870fc
change to use v1alpha2 back
capri-xiyue Jul 15, 2025
3e8083e
resolve merge conflicts
capri-xiyue Jul 15, 2025
4d40705
fixed typo
capri-xiyue Jul 15, 2025
d0bc179
fixed typo
capri-xiyue Jul 15, 2025
7d47b9e
fixed pipeline
capri-xiyue Jul 15, 2025
da5c46c
fixed boilerplate
capri-xiyue Jul 15, 2025
0e243c6
changed unused code
capri-xiyue Jul 15, 2025
9612b94
make test pipeline pass
capri-xiyue Jul 15, 2025
c97c609
fixed missing dependecny update
capri-xiyue Jul 15, 2025
a16c5a1
fixed imports
capri-xiyue Jul 15, 2025
aab4e67
fixed change
capri-xiyue Jul 15, 2025
c1765e4
merge to v1-inferencepool
capri-xiyue Jul 15, 2025
f8ce6d5
fixed integration test
capri-xiyue Jul 15, 2025
152b5a1
fixed import
capri-xiyue Jul 15, 2025
077c884
fixed import
capri-xiyue Jul 15, 2025
0104bae
removed x-inferencepool usage
capri-xiyue Jul 15, 2025
2cbaad5
change add to install
capri-xiyue Jul 15, 2025
dd94025
fixed import
capri-xiyue Jul 16, 2025
9bbdb5e
change back to main image
capri-xiyue Jul 16, 2025
98e9854
fixed import issue
capri-xiyue Jul 17, 2025
d8dd957
fixed format
capri-xiyue Jul 17, 2025
d311020
fixed pipeline
capri-xiyue Jul 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,12 @@ help: ## Display this help.

##@ Development

.PHONY: manifests
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases

.PHONY: generate
generate: controller-gen code-generator ## Generate WebhookConfiguration, ClusterRole, CustomResourceDefinition objects, code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
generate: controller-gen code-generator manifests ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate/boilerplate.generatego.txt" paths="./..."
./hack/update-codegen.sh

Expand Down Expand Up @@ -128,15 +132,15 @@ vet: ## Run go vet against code.
go vet ./...

.PHONY: test
test: generate fmt vet envtest image-build verify-crds ## Run tests.
test: manifests generate fmt vet envtest image-build ## Run tests.
CGO_ENABLED=1 KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e | grep -v /conformance) -race -coverprofile cover.out

.PHONY: test-unit
test-unit: ## Run unit tests.
CGO_ENABLED=1 KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./pkg/... -race -coverprofile cover.out

.PHONY: test-integration
test-integration: envtest ## Run integration tests.
test-integration: ## Run integration tests.
CGO_ENABLED=1 KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./test/integration/epp/... -race -coverprofile cover.out

.PHONY: test-e2e
Expand All @@ -156,13 +160,9 @@ ci-lint: golangci-lint
$(GOLANGCI_LINT) run --timeout 15m0s

.PHONY: verify
verify: vet fmt-verify generate ci-lint verify-all
verify: vet fmt-verify manifests generate ci-lint verify-all
git --no-pager diff --exit-code config api client-go

.PHONY: verify-crds
verify-crds: kubectl-validate
hack/verify-manifests.sh

# Run static analysis.
.PHONY: verify-all
verify-all:
Expand Down Expand Up @@ -307,11 +307,11 @@ ifndef ignore-not-found
endif

.PHONY: install
install: generate kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -

.PHONY: uninstall
uninstall: generate 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.
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.
$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -

##@ Helm
Expand Down Expand Up @@ -354,15 +354,13 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
HELM = $(PROJECT_DIR)/bin/helm
YQ = $(PROJECT_DIR)/bin/yq
KUBECTL_VALIDATE = $(PROJECT_DIR)/bin/kubectl-validate

## Tool Versions
KUSTOMIZE_VERSION ?= v5.4.3
CONTROLLER_TOOLS_VERSION ?= v0.16.1
ENVTEST_VERSION ?= release-0.19
GOLANGCI_LINT_VERSION ?= v1.62.2
HELM_VERSION ?= v3.17.1
KUBECTL_VALIDATE_VERSION ?= v0.0.4

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down Expand Up @@ -392,11 +390,6 @@ yq: ## Download yq locally if necessary.
helm: ## Download helm locally if necessary.
GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install helm.sh/helm/v3/cmd/helm@$(HELM_VERSION)

.PHONY: kubectl-validate
kubectl-validate: $(KUBECTL_VALIDATE) ## Download kubectl-validate locally if necessary.
$(KUBECTL_VALIDATE): $(LOCALBIN)
$(call go-install-tool,$(KUBECTL_VALIDATE),sigs.k8s.io/kubectl-validate,$(KUBECTL_VALIDATE_VERSION))

# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
# $1 - target path with name of binary
# $2 - package url which can be installed
Expand Down
29 changes: 2 additions & 27 deletions api/v1/inferencepool_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package v1

import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -177,7 +178,7 @@ type InferencePoolStatus struct {
// PoolStatus defines the observed state of InferencePool from a Gateway.
type PoolStatus struct {
// GatewayRef indicates the gateway that observed state of InferencePool.
GatewayRef ParentGatewayReference `json:"parentRef"`
GatewayRef corev1.ObjectReference `json:"parentRef"`

// Conditions track the state of the InferencePool.
//
Expand Down Expand Up @@ -265,29 +266,3 @@ const (
// or API group, or a reference to a resource that can not be found.
InferencePoolReasonInvalidExtensionRef InferencePoolReason = "InvalidExtensionRef"
)

// ParentGatewayReference identifies an API object including its namespace,
// defaulting to Gateway.
type ParentGatewayReference struct {
// Group is the group of the referent.
//
// +optional
// +kubebuilder:default="gateway.networking.k8s.io"
Group *Group `json:"group"`

// Kind is kind of the referent. For example "Gateway".
//
// +optional
// +kubebuilder:default=Gateway
Kind *Kind `json:"kind"`

// Name is the name of the referent.
Name ObjectName `json:"name"`

// Namespace is the namespace of the referent. If not present,
// the namespace of the referent is assumed to be the same as
// the namespace of the referring object.
//
// +optional
Namespace *Namespace `json:"namespace,omitempty"`
}
32 changes: 1 addition & 31 deletions api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading