github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

use more apt name for flag

Browse Source
This commit is contained in:
Alexander Zielenski 2022-07-20 10:45:21 -07:00
parent a4819996a8
commit c2cbc460f2
No known key found for this signature in database
GPG Key ID: 754BC11B447F7843
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/equality.go
View File

@ -33,12 +33,12 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
func determineIgnoreNonSemanticUpdatesEnabled() bool { func determineAvoidNoopTimestampUpdatesEnabled() bool {
if ignoreNonSemanticUpdatesString, exists := os.LookupEnv("KUBE_APISERVER_IGNORE_NON_SEMANTIC_UPDATES"); exists { if avoidNoopTimestampUpdatesString, exists := os.LookupEnv("KUBE_APISERVER_AVOID_NOOP_SSA_TIMESTAMP_UPDATES"); exists {
if ret, err := strconv.ParseBool(ignoreNonSemanticUpdatesString); err == nil { if ret, err := strconv.ParseBool(avoidNoopTimestampUpdatesString); err == nil {
return ret return ret
} else { } else {
klog.Errorf("failed to parse envar KUBE_APISERVER_IGNORE_NON_SEMANTIC_UPDATES: %v", err) klog.Errorf("failed to parse envar KUBE_APISERVER_AVOID_NOOP_SSA_TIMESTAMP_UPDATES: %v", err)
} }
} }
@ -47,10 +47,10 @@ func determineIgnoreNonSemanticUpdatesEnabled() bool {
} }
var ( var (
ignoreNonSemanticUpdatesEnabled = determineIgnoreNonSemanticUpdatesEnabled() avoidNoopTimestampUpdatesEnabled = determineAvoidNoopTimestampUpdatesEnabled()
) )
var ignoreTimestampEqualities = func() conversion.Equalities { var avoidTimestampEqualities = func() conversion.Equalities {
var eqs = equality.Semantic.Copy() var eqs = equality.Semantic.Copy()
err := eqs.AddFunc( err := eqs.AddFunc(
@ -77,7 +77,7 @@ func IgnoreManagedFieldsTimestampsTransformer(
newObj runtime.Object, newObj runtime.Object,
oldObj runtime.Object, oldObj runtime.Object,
) (res runtime.Object, err error) { ) (res runtime.Object, err error) {
if !ignoreNonSemanticUpdatesEnabled { if !avoidNoopTimestampUpdatesEnabled {
return newObj, nil return newObj, nil
} }
@ -154,11 +154,11 @@ func IgnoreManagedFieldsTimestampsTransformer(
// This condition ensures the managed fields are always compared first. If // This condition ensures the managed fields are always compared first. If
// this check fails, the if statement will short circuit. If the check // this check fails, the if statement will short circuit. If the check
// succeeds the slow path is taken which compares entire objects. // succeeds the slow path is taken which compares entire objects.
if !ignoreTimestampEqualities.DeepEqualWithNilDifferentFromEmpty(oldManagedFields, newManagedFields) { if !avoidTimestampEqualities.DeepEqualWithNilDifferentFromEmpty(oldManagedFields, newManagedFields) {
return newObj, nil return newObj, nil
} }
if ignoreTimestampEqualities.DeepEqualWithNilDifferentFromEmpty(newObj, oldObj) { if avoidTimestampEqualities.DeepEqualWithNilDifferentFromEmpty(newObj, oldObj) {
// Remove any changed timestamps, so that timestamp is not the only // Remove any changed timestamps, so that timestamp is not the only
// change seen by etcd. // change seen by etcd.
// //