Merge pull request #122478 from liangyuanpeng/automated-cherry-pick-of-#121624-upstream-release-1.29

k8s-publishing-bot · k8s-publishing-bot · commit 037e27f0feae · 2024-01-10T18:33:27.000Z
Automated cherry pick of #121624: use context for lazy evaluation.

Kubernetes-commit: eefb0054e84da3322b08b62eef45aa9be390bdd1
diff --git a/pkg/admission/plugin/cel/composition.go b/pkg/admission/plugin/cel/composition.go
@@ -178,7 +178,7 @@ func (a *variableAccessor) Callback(_ *lazy.MapValue) ref.Val {
 		return types.NewErr("composited variable %q fails to compile: %v", a.name, a.result.Error)
 	}
 
-	v, details, err := a.result.Program.Eval(a.activation)
+	v, details, err := a.result.Program.ContextEval(a.context, a.activation)
 	if details == nil {
 		return types.NewErr("unable to get evaluation details of variable %q", a.name)
 	}

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func (a variableAccessor) Callback(_ lazy.MapValue) ref.Val {`
`178`	`178`	`return types.NewErr("composited variable %q fails to compile: %v", a.name, a.result.Error)`
`179`	`179`	`}`
`180`	`180`
`181`		`- v, details, err := a.result.Program.Eval(a.activation)`
	`181`	`+ v, details, err := a.result.Program.ContextEval(a.context, a.activation)`
`182`	`182`	`if details == nil {`
`183`	`183`	`return types.NewErr("unable to get evaluation details of variable %q", a.name)`
`184`	`184`	`}`