@@ -67,6 +67,9 @@ const (
6767
6868 // EnvClusterCacheRetryUseBackoff is the env variable to control whether to use a backoff strategy with the retry during cluster cache sync
6969 EnvClusterCacheRetryUseBackoff = "ARGOCD_CLUSTER_CACHE_RETRY_USE_BACKOFF"
70+
71+ // EnvClusterConnectionMonitoringInterval is the env variable to configure the cluster status monitoring interval.
72+ EnvClusterConnectionMonitoringInterval = "ARGOCD_CLUSTER_STATUS_MONITORING_INTERVAL"
7073)
7174
7275// GitOps engine cluster cache tuning options
98101
99102 // clusterCacheRetryUseBackoff specifies whether to use a backoff strategy on cluster cache sync, if retry is enabled
100103 clusterCacheRetryUseBackoff bool = false
104+
105+ // clusterStatusMonitoringInterval specifies the interval used by Argo CD to monitor the cluster connection status.
106+ clusterStatusMonitoringInterval = 10 * time .Second
101107)
102108
103109func init () {
@@ -109,6 +115,7 @@ func init() {
109115 clusterCacheListSemaphoreSize = env .ParseInt64FromEnv (EnvClusterCacheListSemaphore , clusterCacheListSemaphoreSize , 0 , math .MaxInt64 )
110116 clusterCacheAttemptLimit = int32 (env .ParseNumFromEnv (EnvClusterCacheAttemptLimit , int (clusterCacheAttemptLimit ), 1 , math .MaxInt32 ))
111117 clusterCacheRetryUseBackoff = env .ParseBoolFromEnv (EnvClusterCacheRetryUseBackoff , false )
118+ clusterStatusMonitoringInterval = env .ParseDurationFromEnv (EnvClusterConnectionMonitoringInterval , clusterStatusMonitoringInterval , 0 , math .MaxInt64 )
112119}
113120
114121type LiveStateCache interface {
@@ -183,7 +190,6 @@ func NewLiveStateCache(
183190 settingsMgr : settingsMgr ,
184191 metricsServer : metricsServer ,
185192 clusterSharding : clusterSharding ,
186- clusterFilter : clusterFilter ,
187193 resourceTracking : resourceTracking ,
188194 }
189195}
@@ -517,19 +523,19 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
517523 clustercache .SetRetryOptions (clusterCacheAttemptLimit , clusterCacheRetryUseBackoff , isRetryableError ),
518524 clustercache .SetRespectRBAC (respectRBAC ),
519525 clustercache .SetClusterStatusRetryFunc (isTransientNetworkErr ),
520- clustercache .SetClusterConnectionInterval (10 * time . Second ),
526+ clustercache .SetClusterConnectionInterval (clusterStatusMonitoringInterval ),
521527 }
522528
523529 clusterCache = clustercache .NewClusterCache (clusterCacheConfig , clusterCacheOpts ... )
524530
525- // Make sure to check if the monitoring interval is disabled
526-
527- ctx , cancel := context .WithCancel (context .Background ())
528- if c .clusterStatusCancel == nil {
529- c .clusterStatusCancel = make (map [string ]context.CancelFunc )
531+ if clusterStatusMonitoringInterval != 0 {
532+ ctx , cancel := context .WithCancel (context .Background ())
533+ if c .clusterStatusCancel == nil {
534+ c .clusterStatusCancel = make (map [string ]context.CancelFunc )
535+ }
536+ c .clusterStatusCancel [server ] = cancel
537+ clusterCache .StartClusterConnectionStatusMonitoring (ctx )
530538 }
531- c .clusterStatusCancel [server ] = cancel
532- clusterCache .StartClusterConnectionStatusMonitoring (ctx )
533539
534540 _ = clusterCache .OnResourceUpdated (func (newRes * clustercache.Resource , oldRes * clustercache.Resource , namespaceResources map [kube.ResourceKey ]* clustercache.Resource ) {
535541 toNotify := make (map [string ]bool )
0 commit comments