Added multisite with code

splunk · Aug 8, 2023 · c679321 · c679321
1 parent 89ff0ae
commit c679321
Showing 1 changed file with 32 additions and 35 deletions.
diff --git a/pkg/splunk/enterprise/indexercluster.go b/pkg/splunk/enterprise/indexercluster.go
@@ -1128,41 +1128,11 @@ func (mgr *indexerClusterPodManager) isIndexerClusterReadyForUpgrade(ctx context
 		mgr.c = c
 	}
 
-	cm := mgr.getClusterManagerClient(ctx)
-	clusterInfo, err := cm.GetClusterInfo(false)
-	if err != nil {
-		return false, fmt.Errorf("could not get cluster info from cluster manager")
-	}
-	if clusterInfo.MultiSite == "true" {
-		opts := []rclient.ListOption{
-			rclient.InNamespace(cr.GetNamespace()),
-		}
-		indexerList, err := getIndexerClusterList(ctx, c, cr, opts)
-		if err != nil {
-			return false, err
-		}
-		sortedList, err := getIndexerClusterSortedSiteList(ctx, c, cr.Spec.ClusterManagerRef, indexerList)
-
-		preIdx := enterpriseApi.IndexerCluster{}
-
-		for i, v := range sortedList.Items {
-			if &v == cr {
-				if i > 0 {
-					preIdx = sortedList.Items[i-1]
-				}
-				break
-
-			}
-		}
-		if len(preIdx.Name) != 0 {
-			image, _ := getCurrentImage(ctx, c, &preIdx, SplunkIndexer)
-			if preIdx.Status.Phase != enterpriseApi.PhaseReady || image != cr.Spec.Image {
-				return false, nil
-			}
-		}
-
-	}
-
+	// cm := mgr.getClusterManagerClient(ctx)
+	// clusterInfo, err := cm.GetClusterInfo(false)
+	// if err != nil {
+	// 	return false, fmt.Errorf("could not get cluster info from cluster manager")
+	// }
 	// check if a search head cluster exists with the same ClusterManager instance attached
 	searchHeadClusterInstance := enterpriseApi.SearchHeadCluster{}
 	opts := []rclient.ListOption{
@@ -1209,5 +1179,32 @@ func (mgr *indexerClusterPodManager) isIndexerClusterReadyForUpgrade(ctx context
 	if (cr.Spec.Image != idxImage) && (searchHeadClusterInstance.Status.Phase != enterpriseApi.PhaseReady || shcImage != cr.Spec.Image) {
 		return false, nil
 	}
+
+	opts = []rclient.ListOption{
+		rclient.InNamespace(cr.GetNamespace()),
+	}
+	indexerList, err := getIndexerClusterList(ctx, c, cr, opts)
+	if err != nil {
+		return false, err
+	}
+	sortedList, err := getIndexerClusterSortedSiteList(ctx, c, cr.Spec.ClusterManagerRef, indexerList)
+
+	preIdx := enterpriseApi.IndexerCluster{}
+
+	for i, v := range sortedList.Items {
+		if &v == cr {
+			if i > 0 {
+				preIdx = sortedList.Items[i-1]
+			}
+			break
+
+		}
+	}
+	if len(preIdx.Name) != 0 {
+		image, _ := getCurrentImage(ctx, c, &preIdx, SplunkIndexer)
+		if preIdx.Status.Phase != enterpriseApi.PhaseReady || image != cr.Spec.Image {
+			return false, nil
+		}
+	}
 	return true, nil
 }