github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130627 from jpbetz/declarative-validation-cleanups

Browse Source 
Add all extra_pkgs needed by main API types to validation-gen
This commit is contained in:
Kubernetes Prow Robot 2025-03-06 19:55:44 -08:00 committed by GitHub
commit 9625c4a2d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/update-codegen.sh
View File

@ -430,8 +430,16 @@ function codegen::validation() {
tag_pkgs+=("./$dir") tag_pkgs+=("./$dir")
done done
# This list needs to cover all of the types used transitively from the
# main API types. Validations defined on types in these packages will be
# used, but not regenerated, unless they are also listed as a "regular"
# input on the command-line.
local extra_pkgs=( local extra_pkgs=(
k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/runtime
k8s.io/apimachinery/pkg/types
k8s.io/apimachinery/pkg/util/intstr
) )
kube::log::status "Generating validation code for ${#tag_pkgs[@]} targets" kube::log::status "Generating validation code for ${#tag_pkgs[@]} targets"

9
staging/src/k8s.io/code-generator/cmd/validation-gen/validation.go
View File

@ -27,14 +27,15 @@ import (
"strings" "strings"
"unicode" "unicode"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/code-generator/cmd/validation-gen/validators"
"k8s.io/gengo/v2/generator" "k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer" "k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/parser/tags" "k8s.io/gengo/v2/parser/tags"
"k8s.io/gengo/v2/types" "k8s.io/gengo/v2/types"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/code-generator/cmd/validation-gen/validators"
) )
func mkPkgNames(pkg string, names ...string) []types.Name { func mkPkgNames(pkg string, names ...string) []types.Name {
@ -345,7 +346,7 @@ func (td *typeDiscoverer) discover(t *types.Type, fldPath *field.Path) (*typeNod
// Discover into this type before extracting type validations. // Discover into this type before extracting type validations.
switch t.Kind { switch t.Kind {
case types.Builtin: case types.Builtin, types.Interface:
// Nothing more to do. // Nothing more to do.
case types.Alias: case types.Alias:
// Discover the underlying type. // Discover the underlying type.