KEP-3619: should check supplementalGroupsPolicyInUse for oldNode in dropDisabledFields for node

everpeace · everpeace · commit 1663223e58b5 · 2024-07-16T12:36:00.000+09:00
diff --git a/pkg/registry/core/node/strategy.go b/pkg/registry/core/node/strategy.go
@@ -107,7 +107,7 @@ func dropDisabledFields(node *api.Node, oldNode *api.Node) {
 		node.Status.RuntimeHandlers = nil
 	}
 
-	if !utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) {
+	if !utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) && !supplementalGroupsPolicyInUse(oldNode) {
 		node.Status.Features = nil
 	}
 }
@@ -299,3 +299,11 @@ func fieldIsDeprecatedWarnings(obj runtime.Object) []string {
 	}
 	return warnings
 }
+
+// supplementalGroupsPolicyInUse returns true if the node.status has NodeFeature
+func supplementalGroupsPolicyInUse(node *api.Node) bool {
+	if node == nil {
+		return false
+	}
+	return node.Status.Features != nil
+}

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func dropDisabledFields(node api.Node, oldNode api.Node) {`
`107`	`107`	`node.Status.RuntimeHandlers = nil`
`108`	`108`	`}`
`109`	`109`
`110`		`- if !utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) {`
	`110`	`+ if !utilfeature.DefaultFeatureGate.Enabled(features.SupplementalGroupsPolicy) && !supplementalGroupsPolicyInUse(oldNode) {`
`111`	`111`	`node.Status.Features = nil`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -299,3 +299,11 @@ func fieldIsDeprecatedWarnings(obj runtime.Object) []string {`
`299`	`299`	`}`
`300`	`300`	`return warnings`
`301`	`301`	`}`
	`302`	`+`
	`303`	`+// supplementalGroupsPolicyInUse returns true if the node.status has NodeFeature`
	`304`	`+func supplementalGroupsPolicyInUse(node *api.Node) bool {`
	`305`	`+ if node == nil {`
	`306`	`+ return false`
	`307`	`+ }`
	`308`	`+ return node.Status.Features != nil`
	`309`	`+}`