github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

support opaque kinds

Browse Source
This commit is contained in:
Joe Betz 2024-07-25 15:04:09 -04:00
parent 0a4e863373
commit 953fbaca48
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/cel/cidr.go
View File

@ -33,7 +33,7 @@ type CIDR struct {
} }
var ( var (
CIDRType = cel.ObjectType("net.CIDR") CIDRType = cel.OpaqueType("net.CIDR")
) )
// ConvertToNative implements ref.Val.ConvertToNative. // ConvertToNative implements ref.Val.ConvertToNative.

2
staging/src/k8s.io/apiserver/pkg/cel/ip.go
View File

@ -33,7 +33,7 @@ type IP struct {
} }
var ( var (
IPType = cel.ObjectType("net.IP") IPType = cel.OpaqueType("net.IP")
) )
// ConvertToNative implements ref.Val.ConvertToNative. // ConvertToNative implements ref.Val.ConvertToNative.

10
staging/src/k8s.io/apiserver/pkg/cel/library/cost.go
View File

@ -498,8 +498,15 @@ func (l *CostEstimator) EstimateCallCost(function, overloadId string, target *ch
rhs := args[1] rhs := args[1]
if lhs.Type().Equal(rhs.Type()) == types.True { if lhs.Type().Equal(rhs.Type()) == types.True {
t := lhs.Type() t := lhs.Type()
if t.Kind() == types.OpaqueKind {
switch t.TypeName() {
case cel.IPType.TypeName(), cel.CIDRType.TypeName():
return &checker.CallEstimate{CostEstimate: checker.CostEstimate{Min: 1, Max: 1}}
}
}
if t.Kind() == types.StructKind {
switch t { switch t {
case cel.IPType, cel.CIDRType, cel.QuantityType: // O(1) cost equality checks case cel.QuantityType: // O(1) cost equality checks
return &checker.CallEstimate{CostEstimate: checker.CostEstimate{Min: 1, Max: 1}} return &checker.CallEstimate{CostEstimate: checker.CostEstimate{Min: 1, Max: 1}}
case cel.FormatType: case cel.FormatType:
return &checker.CallEstimate{CostEstimate: checker.CostEstimate{Min: 1, Max: cel.MaxFormatSize}.MultiplyByCostFactor(common.StringTraversalCostFactor)} return &checker.CallEstimate{CostEstimate: checker.CostEstimate{Min: 1, Max: cel.MaxFormatSize}.MultiplyByCostFactor(common.StringTraversalCostFactor)}
@ -515,6 +522,7 @@ func (l *CostEstimator) EstimateCallCost(function, overloadId string, target *ch
} }
} }
} }
}
if panicOnUnknown && !knownUnhandledFunctions[function] { if panicOnUnknown && !knownUnhandledFunctions[function] {
panic(fmt.Errorf("EstimateCallCost: unhandled function %q, target %v, args %v", function, target, args)) panic(fmt.Errorf("EstimateCallCost: unhandled function %q, target %v, args %v", function, target, args))
} }