Skip to content

Commit 5d88b0e

Browse files
authored
Merge pull request kubernetes#124381 from alexzielenski/cel/allOf-validation
apiextensions-apiserver: Support CEL and additionalProperties used inside `allOf`
2 parents ae5543e + fd656ad commit 5d88b0e

File tree

20 files changed

+1359
-426
lines changed

20 files changed

+1359
-426
lines changed

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ func Compile(s *schema.Structural, declType *apiservercel.DeclType, perCallLimit
122122
metrics.Metrics.ObserveCompilation(time.Since(t))
123123
}()
124124

125-
if len(s.Extensions.XValidations) == 0 {
125+
if len(s.XValidations) == 0 {
126126
return nil, nil
127127
}
128-
celRules := s.Extensions.XValidations
128+
celRules := s.XValidations
129129

130130
oldSelfEnvSet, optionalOldSelfEnvSet, err := prepareEnvSet(baseEnvSet, declType)
131131
if err != nil {

0 commit comments

Comments
 (0)