Skip to content

Commit

Permalink
UPSTREAM: <carry>: Backport IP and CIDR CEL base for 1.28
Browse files Browse the repository at this point in the history
This commit needs to be carried until we rebase onto Kube 1.31.

We have backported the library changes to 1.28, which means they can then be used in 1.29.

Upstream, they were only introduced in 1.30 which means they wouldn't be usable until 1.31.

This allows us to improve our API validation from OpenShift 4.16 onwards, instead of OpenShift 4.18 onwards.

UPSTREAM: <carry>: Set up CEL IP/CIDR library from 4.14 onwards

Carry until K8s 1.31 rebase.
  • Loading branch information
JoelSpeed authored and soltysh committed Jul 1, 2024
1 parent 9de56e0 commit efd75b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/cel/environment/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ var baseOptsWithoutStrictCost = []VersionedOptions{
},
},
{
IntroducedVersion: version.MajorMinor(1, 30),
IntroducedVersion: version.MajorMinor(1, 27),
EnvOptions: []cel.EnvOption{
library.IP(),
library.CIDR(),
Expand Down

0 comments on commit efd75b7

Please sign in to comment.