From 2b24c518b04b67070c2e6bdbeb9f8ee74eb429c8 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Thu, 23 Jan 2025 15:15:42 +0000 Subject: [PATCH] Drop declaration of IP/CDIR type CEL variables --- staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go | 4 +--- staging/src/k8s.io/apiserver/pkg/cel/library/ip.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go b/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go index 2992e99e658..354c9c776ec 100644 --- a/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go +++ b/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go @@ -160,9 +160,7 @@ var cidrLibraryDecls = map[string][]cel.FunctionOpt{ } func (*cidrs) CompileOptions() []cel.EnvOption { - options := []cel.EnvOption{cel.Types(apiservercel.CIDRType), - cel.Variable(apiservercel.CIDRType.TypeName(), types.NewTypeTypeWithParam(apiservercel.CIDRType)), - } + options := []cel.EnvOption{cel.Types(apiservercel.CIDRType)} for name, overloads := range cidrLibraryDecls { options = append(options, cel.Function(name, overloads...)) } diff --git a/staging/src/k8s.io/apiserver/pkg/cel/library/ip.go b/staging/src/k8s.io/apiserver/pkg/cel/library/ip.go index 8edc4463a07..5a089ae1cdf 100644 --- a/staging/src/k8s.io/apiserver/pkg/cel/library/ip.go +++ b/staging/src/k8s.io/apiserver/pkg/cel/library/ip.go @@ -187,9 +187,7 @@ var ipLibraryDecls = map[string][]cel.FunctionOpt{ } func (*ip) CompileOptions() []cel.EnvOption { - options := []cel.EnvOption{cel.Types(apiservercel.IPType), - cel.Variable(apiservercel.IPType.TypeName(), types.NewTypeTypeWithParam(apiservercel.IPType)), - } + options := []cel.EnvOption{cel.Types(apiservercel.IPType)} for name, overloads := range ipLibraryDecls { options = append(options, cel.Function(name, overloads...)) }