Skip to content

Commit a6c7f5a

Browse files
danehansdanehans
committed
Inference: Replaces InferencePool v1alpha2 with v1
Signed-off-by: Daneyon Hansen <[email protected]>
1 parent cfd648f commit a6c7f5a

Some content is hidden

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

45 files changed

+474
-805
lines changed

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,11 @@ gw-api-crds: ## Install the Gateway API CRDs
500500
# The version of the k8s gateway api inference extension CRDs to install.
501501
GIE_CRD_VERSION ?= $(shell go list -m sigs.k8s.io/gateway-api-inference-extension | awk '{print $$2}')
502502

503+
# TODO [danehans]: Replace commit hash with GIE_CRD_VERSION once upstream published the v1.0.0 tag.
504+
# https://github.com/kgateway-dev/kgateway/issues/11964
503505
.PHONY: gie-crds
504506
gie-crds: gw-api-crds ## Install the Gateway API Inference Extension CRDs
505-
kubectl apply -f "https://github.com/kubernetes-sigs/gateway-api-inference-extension/releases/download/$(GIE_CRD_VERSION)/manifests.yaml"
507+
kubectl kustomize "https://github.com/kubernetes-sigs/gateway-api-inference-extension/config/crd/?ref=2d7613c9b2bebada4c212495326272137c5846db" | kubectl apply -f -
506508

507509
.PHONY: kind-metallb
508510
metallb: ## Install the MetalLB load balancer

‎go.mod‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/kelseyhightower/envconfig v1.4.0
2121
github.com/mitchellh/hashstructure v1.0.0
2222
github.com/onsi/ginkgo/v2 v2.23.4
23-
github.com/onsi/gomega v1.37.0
23+
github.com/onsi/gomega v1.38.0
2424
github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966
2525
github.com/solo-io/go-list-licenses v0.1.4
2626
github.com/solo-io/go-utils v0.27.3
@@ -31,24 +31,24 @@ require (
3131
go.uber.org/zap v1.27.0
3232
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
3333
golang.org/x/net v0.42.0
34-
google.golang.org/grpc v1.73.0
34+
google.golang.org/grpc v1.74.2
3535
google.golang.org/protobuf v1.36.6
36-
helm.sh/helm/v3 v3.17.3
37-
istio.io/api v1.26.0-alpha.0.0.20250708022530-f8c0a53baaf9
38-
istio.io/client-go v1.26.0-alpha.0.0.20250708023131-44cd7c661bad
36+
helm.sh/helm/v3 v3.18.4
37+
istio.io/api v1.26.0-alpha.0.0.20250807121626-dc36c0a88d2f
38+
istio.io/client-go v1.26.0-alpha.0.0.20250807122224-d30e00749aaa
3939
istio.io/istio v0.0.0-20250728092114-6111de93199e
40-
k8s.io/api v0.33.2
41-
k8s.io/apiextensions-apiserver v0.33.2
42-
k8s.io/apimachinery v0.33.2
43-
k8s.io/client-go v0.33.2
40+
k8s.io/api v0.33.3
41+
k8s.io/apiextensions-apiserver v0.33.3
42+
k8s.io/apimachinery v0.33.3
43+
k8s.io/client-go v0.33.3
4444
k8s.io/klog/v2 v2.130.1
4545
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
4646
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
4747
sigs.k8s.io/controller-runtime v0.21.0
4848
sigs.k8s.io/gateway-api v1.3.0
49-
sigs.k8s.io/gateway-api-inference-extension v0.5.1
49+
sigs.k8s.io/gateway-api-inference-extension v0.0.0-20250811174308-2d7613c9b2be
5050
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
51-
sigs.k8s.io/yaml v1.5.0
51+
sigs.k8s.io/yaml v1.6.0
5252
)
5353

5454
require (
@@ -67,7 +67,7 @@ require (
6767
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
6868
github.com/dlclark/regexp2 v1.11.5 // indirect
6969
github.com/elliotchance/orderedmap v1.8.0 // indirect
70-
github.com/goccy/go-yaml v1.17.1 // indirect
70+
github.com/goccy/go-yaml v1.18.0 // indirect
7171
github.com/google/certificate-transparency-go v1.3.1 // indirect
7272
github.com/google/go-github/v74 v74.0.0 // indirect
7373
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
@@ -91,10 +91,11 @@ require (
9191
go.augendre.info/fatcontext v0.8.0 // indirect
9292
go.yaml.in/yaml/v2 v2.4.2 // indirect
9393
go.yaml.in/yaml/v3 v3.0.3 // indirect
94-
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
9594
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
9695
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9796
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
97+
gotest.tools/v3 v3.4.0 // indirect
98+
oras.land/oras-go/v2 v2.6.0 // indirect
9899
)
99100

100101
require (
@@ -116,7 +117,6 @@ require (
116117
dario.cat/mergo v1.0.2 // indirect
117118
github.com/4meepo/tagalign v1.4.2 // indirect
118119
github.com/Abirdcfly/dupword v0.1.3 // indirect
119-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
120120
github.com/AlekSi/pointer v1.2.0 // indirect
121121
github.com/Antonboom/errname v1.1.0 // indirect
122122
github.com/Antonboom/nilnil v1.1.0 // indirect
@@ -232,7 +232,7 @@ require (
232232
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
233233
github.com/ckaznocha/intrange v0.3.1 // indirect
234234
github.com/cloudflare/circl v1.6.1 // indirect
235-
github.com/containerd/containerd v1.7.24 // indirect
235+
github.com/containerd/containerd v1.7.27 // indirect
236236
github.com/containerd/errdefs v1.0.0 // indirect
237237
github.com/containerd/log v0.1.0 // indirect
238238
github.com/containerd/platforms v0.2.1 // indirect
@@ -257,16 +257,14 @@ require (
257257
github.com/docker/docker v28.2.2+incompatible // indirect
258258
github.com/docker/docker-credential-helpers v0.9.3 // indirect
259259
github.com/docker/go-connections v0.5.0 // indirect
260-
github.com/docker/go-metrics v0.0.1 // indirect
261260
github.com/docker/go-units v0.5.0 // indirect
262-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
263261
github.com/dustin/go-humanize v1.0.1 // indirect
264262
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
265263
github.com/emirpasic/gods v1.18.1 // indirect
266264
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
267265
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
268266
github.com/ettle/strcase v0.2.0 // indirect
269-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
267+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
270268
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
271269
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
272270
github.com/fatih/color v1.18.0 // indirect
@@ -311,7 +309,7 @@ require (
311309
github.com/go-toolsmith/astp v1.1.0 // indirect
312310
github.com/go-toolsmith/strparse v1.1.0 // indirect
313311
github.com/go-toolsmith/typep v1.1.0 // indirect
314-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
312+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
315313
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
316314
github.com/gobuffalo/flect v1.0.3 // indirect
317315
github.com/gobwas/glob v0.2.3 // indirect
@@ -337,7 +335,7 @@ require (
337335
github.com/google/go-containerregistry v0.20.6 // indirect
338336
github.com/google/go-querystring v1.1.0 // indirect
339337
github.com/google/ko v0.18.0 // indirect
340-
github.com/google/pprof v0.0.0-20250501235452-c0086092b71a // indirect
338+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
341339
github.com/google/rpmpack v0.7.0 // indirect
342340
github.com/google/s2a-go v0.1.9 // indirect
343341
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
@@ -351,7 +349,6 @@ require (
351349
github.com/goreleaser/fileglob v1.3.0 // indirect
352350
github.com/goreleaser/goreleaser/v2 v2.11.1 // indirect
353351
github.com/goreleaser/nfpm/v2 v2.43.0 // indirect
354-
github.com/gorilla/mux v1.8.1 // indirect
355352
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
356353
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
357354
github.com/gostaticanalysis/comment v1.5.0 // indirect
@@ -444,7 +441,6 @@ require (
444441
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
445442
github.com/mitchellh/reflectwalk v1.0.2 // indirect
446443
github.com/moby/docker-image-spec v1.3.1 // indirect
447-
github.com/moby/locker v1.0.1 // indirect
448444
github.com/moby/spdystream v0.5.0 // indirect
449445
github.com/moby/term v0.5.2 // indirect
450446
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -484,7 +480,7 @@ require (
484480
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
485481
github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect
486482
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
487-
github.com/prometheus/client_golang v1.22.0
483+
github.com/prometheus/client_golang v1.23.0
488484
github.com/prometheus/client_model v0.6.2
489485
github.com/prometheus/common v0.65.0 // indirect
490486
github.com/prometheus/procfs v0.16.1 // indirect
@@ -498,7 +494,7 @@ require (
498494
github.com/redis/go-redis/extra/redisotel/v9 v9.7.1 // indirect
499495
github.com/rivo/uniseg v0.4.7 // indirect
500496
github.com/rogpeppe/go-internal v1.14.1 // indirect
501-
github.com/rubenv/sql-migrate v1.7.1 // indirect
497+
github.com/rubenv/sql-migrate v1.8.0 // indirect
502498
github.com/russross/blackfriday/v2 v2.1.0 // indirect
503499
github.com/ryancurrah/gomodguard v1.4.1 // indirect
504500
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
@@ -599,8 +595,8 @@ require (
599595
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
600596
google.golang.org/api v0.235.0 // indirect
601597
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
602-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
603-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
598+
google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 // indirect
599+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
604600
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
605601
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
606602
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -609,16 +605,15 @@ require (
609605
gopkg.in/yaml.v2 v2.4.0 // indirect
610606
gopkg.in/yaml.v3 v3.0.1 // indirect
611607
honnef.co/go/tools v0.6.1 // indirect
612-
k8s.io/apiserver v0.33.2 // indirect
613-
k8s.io/cli-runtime v0.33.0 // indirect
614-
k8s.io/code-generator v0.33.2 // indirect
615-
k8s.io/component-base v0.33.2 // indirect
608+
k8s.io/apiserver v0.33.3 // indirect
609+
k8s.io/cli-runtime v0.33.2 // indirect
610+
k8s.io/code-generator v0.33.3 // indirect
611+
k8s.io/component-base v0.33.3 // indirect
616612
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
617-
k8s.io/kubectl v0.33.0 // indirect
613+
k8s.io/kubectl v0.33.2 // indirect
618614
lukechampine.com/blake3 v1.2.1 // indirect
619615
mvdan.cc/gofumpt v0.8.0 // indirect
620616
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
621-
oras.land/oras-go v1.2.5 // indirect
622617
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231019135941-15d792835235 // indirect
623618
sigs.k8s.io/controller-tools v0.18.1-0.20250625175829-8d11ce77f347 // indirect
624619
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
@@ -639,6 +634,9 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
639634
// Ref: https://github.com/kubernetes/gengo/issues/292
640635
replace k8s.io/gengo/v2 => github.com/kgateway-dev/gengo/v2 v2.0.0-20250512195215-4fa0a9df2978
641636

637+
// Remove once Istio is bumped to support InferencePool v1: https://github.com/istio/istio/pull/57295
638+
replace istio.io/istio => github.com/danehans/istio v0.0.0-20250807230115-26506284c1a4
639+
642640
tool (
643641
github.com/golang/mock/mockgen
644642
github.com/golangci/golangci-lint/v2/cmd/golangci-lint

0 commit comments

Comments
 (0)