From 8828530fd5b2fff0b1e30f84b37bcb0087be8d7f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 9 Mar 2024 09:48:14 +0900 Subject: [PATCH] node: dropDisabledFields: recognize RecursiveReadOnlyMounts gate Signed-off-by: Akihiro Suda --- pkg/registry/core/node/strategy.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go index a6900429ff8..e6932db7346 100644 --- a/pkg/registry/core/node/strategy.go +++ b/pkg/registry/core/node/strategy.go @@ -34,9 +34,11 @@ import ( "k8s.io/apiserver/pkg/registry/generic" pkgstorage "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/names" + utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/validation" + "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/client" "sigs.k8s.io/structured-merge-diff/v4/fieldpath" ) @@ -101,6 +103,9 @@ func dropDisabledFields(node *api.Node, oldNode *api.Node) { node.Spec.ConfigSource = nil } + if !utilfeature.DefaultFeatureGate.Enabled(features.RecursiveReadOnlyMounts) { + node.Status.RuntimeClasses = nil + } } // nodeConfigSourceInUse returns true if node's Spec ConfigSource is set(used)