Merge pull request #623 from 27149chen/cherry-pick-622

[release/0.7] featureGate: IgnoreLeaseSync => IgnoreSyncLease
clusterpedia-io · Dec 21, 2023 · c73596f · c73596f
2 parents 002486a + bcc9def
commit c73596f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/synchromanager/clustersynchro/resource_negotiator.go b/pkg/synchromanager/clustersynchro/resource_negotiator.go
@@ -88,7 +88,7 @@ func (negotiator *ResourceNegotiator) NegotiateSyncResources(syncResources []clu
 		for _, resource := range groupResources.Resources {
 			syncGR := schema.GroupResource{Group: groupResources.Group, Resource: resource}
 
-			if clusterpediafeature.FeatureGate.Enabled(features.IgnoreLeaseSync) {
+			if clusterpediafeature.FeatureGate.Enabled(features.IgnoreSyncLease) {
 				// skip leases.coordination.k8s.io
 				if syncGR.String() == "leases.coordination.k8s.io" {
 					continue

diff --git a/pkg/synchromanager/features/features.go b/pkg/synchromanager/features/features.go
@@ -46,12 +46,12 @@ const (
 	// alpha: v0.6.0
 	HealthCheckerWithStandaloneTCP featuregate.Feature = "HealthCheckerWithStandaloneTCP"
 
-	// IgnoreLeaseSync is a feature gate for the ClusterSynchro to skip syncing leases.coordination.k8s.io,
+	// IgnoreSyncLease is a feature gate for the ClusterSynchro to skip syncing leases.coordination.k8s.io,
 	// if you enable this feature, these resources will not be synced no matter what `syncResources` are defined.
 	//
 	// owner: @27149chen
 	// alpha: v0.8.0
-	IgnoreLeaseSync featuregate.Feature = "IgnoreLeaseSync"
+	IgnoreSyncLease featuregate.Feature = "IgnoreSyncLease"
 )
 
 func init() {
@@ -66,5 +66,5 @@ var defaultClusterSynchroManagerFeatureGates = map[featuregate.Feature]featurega
 	AllowSyncAllCustomResources:    {Default: false, PreRelease: featuregate.Alpha},
 	AllowSyncAllResources:          {Default: false, PreRelease: featuregate.Alpha},
 	HealthCheckerWithStandaloneTCP: {Default: false, PreRelease: featuregate.Alpha},
-	IgnoreLeaseSync:                {Default: false, PreRelease: featuregate.Alpha},
+	IgnoreSyncLease:                {Default: false, PreRelease: featuregate.Alpha},
 }