fix: infer correct shard in statefulset setup

argoproj · Feb 10, 2024 · e80b403 · e80b403
1 parent bb1c1ed
commit e80b403
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/argocd-application-controller/commands/argocd_application_controller.go b/cmd/argocd-application-controller/commands/argocd_application_controller.go
@@ -241,7 +241,7 @@ func NewCommand() *cobra.Command {
 func getClusterSharding(kubeClient *kubernetes.Clientset, settingsMgr *settings.SettingsManager, shardingAlgorithm string, enableDynamicClusterDistribution bool) sharding.ClusterShardingCache {
 	var replicasCount int
 	// StatefulSet mode and Deployment mode uses different default values for shard number.
-	defaultShardNumberValue := 0
+	defaultShardNumberValue := -1
 	applicationControllerName := env.StringFromEnv(common.EnvAppControllerName, common.DefaultApplicationControllerName)
 	appControllerDeployment, err := kubeClient.AppsV1().Deployments(settingsMgr.GetNamespace()).Get(context.Background(), applicationControllerName, metav1.GetOptions{})
 
@@ -252,7 +252,6 @@ func getClusterSharding(kubeClient *kubernetes.Clientset, settingsMgr *settings.
 
 	if enableDynamicClusterDistribution && appControllerDeployment != nil && appControllerDeployment.Spec.Replicas != nil {
 		replicasCount = int(*appControllerDeployment.Spec.Replicas)
-		defaultShardNumberValue = -1
 	} else {
 		replicasCount = env.ParseNumFromEnv(common.EnvControllerReplicas, 0, 0, math.MaxInt32)
 	}
@@ -285,6 +284,7 @@ func getClusterSharding(kubeClient *kubernetes.Clientset, settingsMgr *settings.
 			}
 		}
 	} else {
+		defaultShardNumberValue = 0
 		log.Info("Processing all cluster shards")
 	}
 	db := db.NewDB(settingsMgr.GetNamespace(), settingsMgr, kubeClient)