Skip to content

Commit c73596f

Browse files
authored
Merge pull request #623 from 27149chen/cherry-pick-622
[release/0.7] featureGate: IgnoreLeaseSync => IgnoreSyncLease
2 parents 002486a + bcc9def commit c73596f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/synchromanager/clustersynchro/resource_negotiator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (negotiator *ResourceNegotiator) NegotiateSyncResources(syncResources []clu
8888
for _, resource := range groupResources.Resources {
8989
syncGR := schema.GroupResource{Group: groupResources.Group, Resource: resource}
9090

91-
if clusterpediafeature.FeatureGate.Enabled(features.IgnoreLeaseSync) {
91+
if clusterpediafeature.FeatureGate.Enabled(features.IgnoreSyncLease) {
9292
// skip leases.coordination.k8s.io
9393
if syncGR.String() == "leases.coordination.k8s.io" {
9494
continue

pkg/synchromanager/features/features.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ const (
4646
// alpha: v0.6.0
4747
HealthCheckerWithStandaloneTCP featuregate.Feature = "HealthCheckerWithStandaloneTCP"
4848

49-
// IgnoreLeaseSync is a feature gate for the ClusterSynchro to skip syncing leases.coordination.k8s.io,
49+
// IgnoreSyncLease is a feature gate for the ClusterSynchro to skip syncing leases.coordination.k8s.io,
5050
// if you enable this feature, these resources will not be synced no matter what `syncResources` are defined.
5151
//
5252
// owner: @27149chen
5353
// alpha: v0.8.0
54-
IgnoreLeaseSync featuregate.Feature = "IgnoreLeaseSync"
54+
IgnoreSyncLease featuregate.Feature = "IgnoreSyncLease"
5555
)
5656

5757
func init() {
@@ -66,5 +66,5 @@ var defaultClusterSynchroManagerFeatureGates = map[featuregate.Feature]featurega
6666
AllowSyncAllCustomResources: {Default: false, PreRelease: featuregate.Alpha},
6767
AllowSyncAllResources: {Default: false, PreRelease: featuregate.Alpha},
6868
HealthCheckerWithStandaloneTCP: {Default: false, PreRelease: featuregate.Alpha},
69-
IgnoreLeaseSync: {Default: false, PreRelease: featuregate.Alpha},
69+
IgnoreSyncLease: {Default: false, PreRelease: featuregate.Alpha},
7070
}

0 commit comments

Comments
 (0)