github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address comment

Browse Source
This commit is contained in:
Cici Huang
2023-12-07 22:39:00 +00:00
parent 048cb8b2ed
commit 44898f7909
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/cel/environment/base.go
View File

@@ -18,13 +18,13 @@ package environment
import ( import (
"fmt" "fmt"
"github.com/google/cel-go/checker"
"github.com/google/cel-go/interpreter"
"strconv" "strconv"
"sync" "sync"
"github.com/google/cel-go/cel" "github.com/google/cel-go/cel"
"github.com/google/cel-go/checker"
"github.com/google/cel-go/ext" "github.com/google/cel-go/ext"
"github.com/google/cel-go/interpreter"
"golang.org/x/sync/singleflight" "golang.org/x/sync/singleflight"
"k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/version"
@@ -64,6 +64,7 @@ var baseOpts = []VersionedOptions{
library.Lists(), library.Lists(),
// cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7. // cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7.
// Since it is a regression fix, we apply it uniformly to all code use v0.17.7.
cel.CostEstimatorOptions(checker.PresenceTestHasCost(false)), cel.CostEstimatorOptions(checker.PresenceTestHasCost(false)),
}, },
ProgramOptions: []cel.ProgramOption{ ProgramOptions: []cel.ProgramOption{
@@ -71,6 +72,7 @@ var baseOpts = []VersionedOptions{
cel.CostLimit(celconfig.PerCallLimit), cel.CostLimit(celconfig.PerCallLimit),
// cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7. // cel-go v0.17.7 change the cost of has() from 0 to 1, but also provided the CostEstimatorOptions option to preserve the old behavior, so we enabled it at the same time we bumped our cel version to v0.17.7.
// Since it is a regression fix, we apply it uniformly to all code use v0.17.7.
cel.CostTrackerOptions(interpreter.PresenceTestHasCost(false)), cel.CostTrackerOptions(interpreter.PresenceTestHasCost(false)),
}, },
}, },