@@ -69,6 +69,9 @@ const (
6969
7070 // EnvClusterCacheRetryUseBackoff is the env variable to control whether to use a backoff strategy with the retry during cluster cache sync
7171 EnvClusterCacheRetryUseBackoff = "ARGOCD_CLUSTER_CACHE_RETRY_USE_BACKOFF"
72+
73+ // EnvClusterConnectionMonitoringInterval is the env variable to configure the cluster status monitoring interval.
74+ EnvClusterConnectionMonitoringInterval = "ARGOCD_CLUSTER_STATUS_MONITORING_INTERVAL"
7275)
7376
7477// GitOps engine cluster cache tuning options
@@ -100,6 +103,9 @@ var (
100103
101104 // clusterCacheRetryUseBackoff specifies whether to use a backoff strategy on cluster cache sync, if retry is enabled
102105 clusterCacheRetryUseBackoff bool = false
106+
107+ // clusterStatusMonitoringInterval specifies the interval used by Argo CD to monitor the cluster connection status.
108+ clusterStatusMonitoringInterval = 10 * time .Second
103109)
104110
105111func init () {
@@ -111,6 +117,7 @@ func init() {
111117 clusterCacheListSemaphoreSize = env .ParseInt64FromEnv (EnvClusterCacheListSemaphore , clusterCacheListSemaphoreSize , 0 , math .MaxInt64 )
112118 clusterCacheAttemptLimit = int32 (env .ParseNumFromEnv (EnvClusterCacheAttemptLimit , int (clusterCacheAttemptLimit ), 1 , math .MaxInt32 ))
113119 clusterCacheRetryUseBackoff = env .ParseBoolFromEnv (EnvClusterCacheRetryUseBackoff , false )
120+ clusterStatusMonitoringInterval = env .ParseDurationFromEnv (EnvClusterConnectionMonitoringInterval , clusterStatusMonitoringInterval , 0 , math .MaxInt64 )
114121}
115122
116123type LiveStateCache interface {
@@ -185,7 +192,6 @@ func NewLiveStateCache(
185192 settingsMgr : settingsMgr ,
186193 metricsServer : metricsServer ,
187194 clusterSharding : clusterSharding ,
188- clusterFilter : clusterFilter ,
189195 resourceTracking : resourceTracking ,
190196 }
191197}
@@ -524,19 +530,19 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
524530 clustercache .SetRetryOptions (clusterCacheAttemptLimit , clusterCacheRetryUseBackoff , isRetryableError ),
525531 clustercache .SetRespectRBAC (respectRBAC ),
526532 clustercache .SetClusterStatusRetryFunc (isTransientNetworkErr ),
527- clustercache .SetClusterConnectionInterval (10 * time . Second ),
533+ clustercache .SetClusterConnectionInterval (clusterStatusMonitoringInterval ),
528534 }
529535
530536 clusterCache = clustercache .NewClusterCache (clusterCacheConfig , clusterCacheOpts ... )
531537
532- // Make sure to check if the monitoring interval is disabled
533-
534- ctx , cancel := context .WithCancel (context .Background ())
535- if c .clusterStatusCancel == nil {
536- c .clusterStatusCancel = make (map [string ]context.CancelFunc )
538+ if clusterStatusMonitoringInterval != 0 {
539+ ctx , cancel := context .WithCancel (context .Background ())
540+ if c .clusterStatusCancel == nil {
541+ c .clusterStatusCancel = make (map [string ]context.CancelFunc )
542+ }
543+ c .clusterStatusCancel [server ] = cancel
544+ clusterCache .StartClusterConnectionStatusMonitoring (ctx )
537545 }
538- c .clusterStatusCancel [server ] = cancel
539- clusterCache .StartClusterConnectionStatusMonitoring (ctx )
540546
541547 _ = clusterCache .OnResourceUpdated (func (newRes * clustercache.Resource , oldRes * clustercache.Resource , namespaceResources map [kube.ResourceKey ]* clustercache.Resource ) {
542548 toNotify := make (map [string ]bool )
0 commit comments