Skip to content

Update CRD generator to handle errors encountered during generation. #4158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Oct 9, 2025
+21 −16
Merged

Update CRD generator to handle errors encountered during generation. #4158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion apis/v1/backendtlspolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ type BackendTLSPolicyValidation struct {
// Support: Implementation-specific
//
// +optional
// +listType=atomic
WellKnownCACertificates *WellKnownCACertificatesType `json:"wellKnownCACertificates,omitempty"`

// Hostname is used for two purposes in the connection between Gateways and
Expand Down
1 change: 0 additions & 1 deletion apis/v1/gateway_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,6 @@ type AllowedRoutes struct {
// Support: Core
//
// +optional
// +listType=atomic
// +kubebuilder:default={from: Same}
Namespaces *RouteNamespaces `json:"namespaces,omitempty"`

Expand Down
6 changes: 3 additions & 3 deletions apis/v1/httproute_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ type GRPCAuthConfig struct {
//
// +optional
// +listType=set
// +kubebuilder:validation:MaxLength=64
// +kubebuilder:validation:MaxItems=64
AllowedRequestHeaders []string `json:"allowedHeaders,omitempty"`
}

Expand Down Expand Up @@ -1719,7 +1719,7 @@ type HTTPAuthConfig struct {
//
// +optional
// +listType=set
// +kubebuilder:validation:MaxLength=64
// +kubebuilder:validation:MaxItems=64
AllowedRequestHeaders []string `json:"allowedHeaders,omitempty"`

// AllowedResponseHeaders specifies what headers from the authorization response
Expand All @@ -1730,7 +1730,7 @@ type HTTPAuthConfig struct {
//
// +optional
// +listType=set
// +kubebuilder:validation:MaxLength=64
// +kubebuilder:validation:MaxItems=64
AllowedResponseHeaders []string `json:"allowedResponseHeaders,omitempty"`
}

Expand Down
12 changes: 12 additions & 0 deletions config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require (
github.com/stretchr/testify v1.11.1
golang.org/x/net v0.44.0
golang.org/x/sync v0.17.0
golang.org/x/tools v0.36.0
google.golang.org/grpc v1.75.1
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
google.golang.org/protobuf v1.36.8
Expand Down Expand Up @@ -81,7 +82,6 @@ require (
golang.org/x/term v0.35.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.36.0 // indirect
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
Expand Down
10 changes: 0 additions & 10 deletions pkg/generated/openapi/zz_generated.openapi.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions pkg/generator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"regexp"
"strings"

"golang.org/x/tools/go/packages"
apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"sigs.k8s.io/controller-tools/pkg/crd"
"sigs.k8s.io/controller-tools/pkg/loader"
Expand Down Expand Up @@ -135,6 +136,10 @@ func main() {
}
}
}

if loader.PrintErrors(roots, packages.TypeError) {
log.Fatalf("not all generators ran successfully")
}
}

func gatewayTweaksMap(channel string, props map[string]apiext.JSONSchemaProps) map[string]apiext.JSONSchemaProps {
Expand Down