From 63a786573645c914d619864bea7dc211f972e4b7 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 1 Nov 2024 13:11:19 +0100 Subject: [PATCH] DRA CEL: properly define IntroducedVersion Using 1.0 was a workaround to grant Kubernetes 1.31 access to things introduce in that same release. In Kubernetes 1.32 we don't need that workaround anymore because everything is still available after a downgrade and thus usable. --- .../src/k8s.io/dynamic-resource-allocation/cel/compile.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/staging/src/k8s.io/dynamic-resource-allocation/cel/compile.go b/staging/src/k8s.io/dynamic-resource-allocation/cel/compile.go index 4e87ac8a46c..dbf04e48748 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/cel/compile.go +++ b/staging/src/k8s.io/dynamic-resource-allocation/cel/compile.go @@ -261,12 +261,7 @@ func mustBuildEnv() *environment.EnvSet { versioned := []environment.VersionedOptions{ { - // Feature epoch was actually 1.31, but we artificially set it to 1.0 because these - // options should always be present. - // - // TODO (https://github.com/kubernetes/kubernetes/issues/123687): set this - // version properly before going to beta. - IntroducedVersion: version.MajorMinor(1, 0), + IntroducedVersion: version.MajorMinor(1, 31), EnvOptions: []cel.EnvOption{ cel.Variable(deviceVar, deviceType.CelType()),