Skip to content

Commit 28ba942

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#129844 from cici37/bumCEL
Bump cel-go to v0.23.2
2 parents 82e3a67 + e1ab607 commit 28ba942

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2827
-1975
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/godbus/dbus/v5 v5.1.0
3636
github.com/gogo/protobuf v1.3.2
3737
github.com/google/cadvisor v0.51.0
38-
github.com/google/cel-go v0.22.0
38+
github.com/google/cel-go v0.23.2
3939
github.com/google/gnostic-models v0.6.9
4040
github.com/google/go-cmp v0.6.0
4141
github.com/google/gofuzz v1.2.0
@@ -126,7 +126,7 @@ require (
126126
)
127127

128128
require (
129-
cel.dev/expr v0.18.0 // indirect
129+
cel.dev/expr v0.19.1 // indirect
130130
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
131131
github.com/MakeNowJust/heredoc v1.0.0 // indirect
132132
github.com/NYTimes/gziphandler v1.1.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bitbucket.org/bertimus9/systemstat v0.5.0 h1:n0aLnh2Jo4nBUBym9cE5PJDG8GT6g+4VuS2Ya2jYYpA=
22
bitbucket.org/bertimus9/systemstat v0.5.0/go.mod h1:EkUWPp8lKFPMXP8vnbpT5JDI0W/sTiLZAvN8ONWErHY=
3-
cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo=
4-
cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
3+
cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
4+
cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
55
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
66
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
77
cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
@@ -285,8 +285,8 @@ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
285285
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
286286
github.com/google/cadvisor v0.51.0 h1:BspqSPdZoLKrnvuZNOvM/KiJ/A+RdixwagN20n+2H8k=
287287
github.com/google/cadvisor v0.51.0/go.mod h1:czGE/c/P/i0QFpVNKTFrIEzord9Y10YfpwuaSWXELc0=
288-
github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g=
289-
github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
288+
github.com/google/cel-go v0.23.2 h1:UdEe3CvQh3Nv+E/j9r1Y//WO0K0cSyD7/y0bzyLIMI4=
289+
github.com/google/cel-go v0.23.2/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo=
290290
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
291291
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
292292
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/emicklei/go-restful/v3 v3.11.0
1313
github.com/fxamacker/cbor/v2 v2.7.0
1414
github.com/gogo/protobuf v1.3.2
15-
github.com/google/cel-go v0.22.0
15+
github.com/google/cel-go v0.23.2
1616
github.com/google/gnostic-models v0.6.9
1717
github.com/google/go-cmp v0.6.0
1818
github.com/google/gofuzz v1.2.0
@@ -42,7 +42,7 @@ require (
4242
)
4343

4444
require (
45-
cel.dev/expr v0.18.0 // indirect
45+
cel.dev/expr v0.19.1 // indirect
4646
github.com/NYTimes/gziphandler v1.1.1 // indirect
4747
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4848
github.com/beorn7/perks v1.0.1 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,18 +2017,21 @@ func TestCelEstimatedCostStability(t *testing.T) {
20172017
"l": listType(&stringType),
20182018
}),
20192019
expectCost: map[string]uint64{
2020-
"optional.of('a') != optional.of('b')": uint64(1844674407370955266),
2021-
"optional.of('a') != optional.none()": uint64(1844674407370955266),
2022-
"optional.of('a').hasValue()": 2,
2023-
"optional.of('a').or(optional.of('a')).hasValue()": 4, // or() is short-circuited
2024-
"optional.none().or(optional.of('a')).hasValue()": 4,
2025-
"optional.of('a').optMap(v, v == 'value').hasValue()": 17,
2026-
"self.obj.?field == optional.of('a')": uint64(1844674407370955268),
2027-
"self.obj.?absentField == optional.none()": uint64(1844674407370955268),
2028-
"self.obj.?field.orValue('v') == 'a'": 5,
2029-
"self.m[?'k'] == optional.of('v')": uint64(1844674407370955268),
2030-
"self.l[?0] == optional.of('a')": uint64(1844674407370955268),
2031-
"optional.ofNonZeroValue(1).hasValue()": 2,
2020+
"optional.of('a') != optional.of('b')": uint64(1844674407370955266),
2021+
"optional.of('a') != optional.none()": uint64(1844674407370955266),
2022+
"optional.of('a').hasValue()": 2,
2023+
"optional.of('a').or(optional.of('a')).hasValue()": 4, // or() is short-circuited
2024+
"optional.none().or(optional.of('a')).hasValue()": 4,
2025+
"optional.of('a').optMap(v, v == 'value').hasValue()": 18,
2026+
"self.obj.?field == optional.of('a')": uint64(1844674407370955268),
2027+
"self.obj.?absentField == optional.none()": uint64(1844674407370955268),
2028+
"self.obj.?field.orValue('v') == 'a'": 5,
2029+
"self.m[?'k'] == optional.of('v')": uint64(1844674407370955268),
2030+
"self.l[?0] == optional.of('a')": uint64(1844674407370955268),
2031+
"optional.ofNonZeroValue(1).hasValue()": 2,
2032+
"optional.of([1, 2, 3, 4, 5]).optMap(v, v.size()).hasValue()": 38,
2033+
"optional.of('abcdefgabcdefg').optMap(v, v.size()).hasValue()": 18,
2034+
"self.l[?0].optMap(v, v == 'a').hasValue()": 22,
20322035
},
20332036
},
20342037
{name: "quantity",

‎staging/src/k8s.io/apiserver/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/go-logr/logr v1.4.2
1818
github.com/gogo/protobuf v1.3.2
1919
github.com/google/btree v1.1.3
20-
github.com/google/cel-go v0.22.0
20+
github.com/google/cel-go v0.23.2
2121
github.com/google/gnostic-models v0.6.9
2222
github.com/google/go-cmp v0.6.0
2323
github.com/google/gofuzz v1.2.0
@@ -66,7 +66,7 @@ require (
6666
)
6767

6868
require (
69-
cel.dev/expr v0.18.0 // indirect
69+
cel.dev/expr v0.19.1 // indirect
7070
github.com/NYTimes/gziphandler v1.1.1 // indirect
7171
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7272
github.com/beorn7/perks v1.0.1 // indirect

‎staging/src/k8s.io/apiserver/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/pkg/cel/environment/base.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ var baseOptsWithoutStrictCost = []VersionedOptions{
173173
{
174174
IntroducedVersion: version.MajorMinor(1, 32),
175175
EnvOptions: []cel.EnvOption{
176-
UnversionedLib(ext.TwoVarComprehensions),
176+
ext.TwoVarComprehensions(),
177177
},
178178
},
179179
}

‎staging/src/k8s.io/cloud-provider/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
)
2626

2727
require (
28-
cel.dev/expr v0.18.0 // indirect
28+
cel.dev/expr v0.19.1 // indirect
2929
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3030
github.com/NYTimes/gziphandler v1.1.1 // indirect
3131
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -49,7 +49,7 @@ require (
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/golang/protobuf v1.5.4 // indirect
5151
github.com/google/btree v1.1.3 // indirect
52-
github.com/google/cel-go v0.22.0 // indirect
52+
github.com/google/cel-go v0.23.2 // indirect
5353
github.com/google/gnostic-models v0.6.9 // indirect
5454
github.com/google/gofuzz v1.2.0 // indirect
5555
github.com/google/uuid v1.6.0 // indirect

‎staging/src/k8s.io/cloud-provider/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)