Skip to content

Commit 3a08811

Browse files
rikatzRyanRosario
authored andcommitted
Separate conformance tests modules from main tests (kubernetes-sigs#1994)
* Separate conformance tests modules from main tests * Add tidy as part of make generate * Rebase and point gw api to monthly-2025.12
1 parent c9f60e2 commit 3a08811

7 files changed

Lines changed: 320 additions & 9 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ latencypredictor/__pycache__
1616
*.out
1717

1818
# Go workspace file
19-
go.work
2019
go.work.sum
2120

2221
# Kubernetes Generated files - skip generated files, except for vendored files

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ help: ## Display this help.
9898
##@ Development
9999

100100
.PHONY: generate
101-
generate: controller-gen code-generator ## Generate WebhookConfiguration, ClusterRole, CustomResourceDefinition objects, code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
101+
generate: controller-gen code-generator tidy ## Generate WebhookConfiguration, ClusterRole, CustomResourceDefinition objects, code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
102102
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate/boilerplate.generatego.txt" paths="./..."
103103
$(CONTROLLER_GEN) crd output:dir="./config/crd/bases" paths="./..."
104104
./hack/update-codegen.sh
@@ -446,6 +446,11 @@ $(GOLANGCI_API_LINT):
446446
yq: ## Download yq locally if necessary.
447447
GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/v4@$(YQ_VERSION)
448448

449+
.PHONY: tidy
450+
tidy:
451+
go work sync
452+
find . -name go.mod -execdir sh -c 'go mod tidy' \;
453+
449454
.PHONY: helm-install
450455
helm-install: $(HELM) ## Download helm locally if necessary.
451456
$(HELM): $(LOCALBIN)

conformance/go.mod

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
module sigs.k8s.io/gateway-api-inference-extension/conformance
2+
3+
go 1.24.9
4+
5+
replace sigs.k8s.io/gateway-api-inference-extension => ../
6+
7+
require (
8+
sigs.k8s.io/gateway-api v1.3.1-0.20251201225624-d2cd60152b8c // monthly-2025.12
9+
sigs.k8s.io/gateway-api-inference-extension v0.0.0-00010101000000-000000000000
10+
)
11+
12+
require (
13+
github.com/go-logr/logr v1.4.3 // indirect
14+
github.com/google/uuid v1.6.0 // indirect
15+
github.com/stretchr/testify v1.11.1
16+
golang.org/x/sync v0.19.0
17+
google.golang.org/protobuf v1.36.11 // indirect
18+
k8s.io/api v0.34.3
19+
k8s.io/apiextensions-apiserver v0.34.3
20+
k8s.io/apimachinery v0.34.3
21+
k8s.io/client-go v0.34.3
22+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
23+
sigs.k8s.io/controller-runtime v0.22.4
24+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
25+
sigs.k8s.io/yaml v1.6.0
26+
)
27+
28+
require sigs.k8s.io/gateway-api/conformance v0.0.0-20251230180038-fc64fe627da4
29+
30+
require (
31+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
34+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
35+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
36+
github.com/go-openapi/jsonreference v0.21.3 // indirect
37+
github.com/go-openapi/swag v0.25.4 // indirect
38+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
39+
github.com/go-openapi/swag/conv v0.25.4 // indirect
40+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
41+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
42+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
43+
github.com/go-openapi/swag/loading v0.25.4 // indirect
44+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
45+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
46+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
47+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
48+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
49+
github.com/gogo/protobuf v1.3.2 // indirect
50+
github.com/google/gnostic-models v0.7.0 // indirect
51+
github.com/json-iterator/go v1.1.12 // indirect
52+
github.com/kr/text v0.2.0 // indirect
53+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
54+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
55+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
56+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
57+
github.com/rogpeppe/go-internal v1.14.1 // indirect
58+
github.com/spf13/pflag v1.0.10 // indirect
59+
github.com/x448/float16 v0.8.4 // indirect
60+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
61+
go.yaml.in/yaml/v2 v2.4.3 // indirect
62+
go.yaml.in/yaml/v3 v3.0.4 // indirect
63+
golang.org/x/net v0.48.0 // indirect
64+
golang.org/x/oauth2 v0.34.0 // indirect
65+
golang.org/x/sys v0.39.0 // indirect
66+
golang.org/x/term v0.38.0 // indirect
67+
golang.org/x/text v0.32.0 // indirect
68+
golang.org/x/time v0.14.0 // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
70+
google.golang.org/grpc v1.78.0 // indirect
71+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
72+
gopkg.in/inf.v0 v0.9.1 // indirect
73+
gopkg.in/yaml.v3 v3.0.1 // indirect
74+
k8s.io/klog/v2 v2.130.1 // indirect
75+
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
76+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
77+
sigs.k8s.io/randfill v1.0.0 // indirect
78+
)

0 commit comments

Comments
 (0)