diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index df6caa21b46..f7e8cbb130b 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1232,6 +1232,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, EnvFiles: { {Version: version.MustParse("1.34"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.35"), Default: true, PreRelease: featuregate.Beta}, }, EventedPLEG: { {Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 67791e17109..e95202d1506 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -932,12 +932,6 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *v1.Pod, container *v1.Container return result, fmt.Errorf("failed to get host path for volume %q: %w", volume, err) } - // Validate key length, must not exceed 128 characters. - // TODO: @HirazawaUi This limit will be relaxed after the EnvFiles feature gate beta stage. - if len(key) > 128 { - return result, fmt.Errorf("environment variable key %q exceeds maximum length of 128 characters", key) - } - // Construct the full path to the environment variable file // by combining hostPath with the specified path in FileKeyRef envFilePath, err := securejoin.SecureJoin(hostPath, f.Path) @@ -951,12 +945,6 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *v1.Pod, container *v1.Container return result, fmt.Errorf("couldn't parse env file") } - // Validate value size, must not exceed 32KB. - // TODO: @HirazawaUi This limit will be relaxed after the EnvFiles feature gate beta stage. - if len(runtimeVal) > 32*1024 { - return result, fmt.Errorf("environment variable value for key %q exceeds maximum size of 32KB", key) - } - // If the key was not found, and it's not optional, return an error if runtimeVal == "" { if optional { diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index a724298c088..9fce9afff62 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -563,6 +563,10 @@ lockToDefault: false preRelease: Alpha version: "1.34" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.35" - name: EventedPLEG versionedSpecs: - default: false