add changes to update_status

FoundationDB · Jul 4, 2023 · 9adb3a2 · 9adb3a2
1 parent 89b4660
commit 9adb3a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/controllers/update_status.go b/controllers/update_status.go
@@ -387,11 +387,6 @@ func checkAndSetProcessStatus(logger logr.Logger, r *FoundationDBClusterReconcil
 
 // Validate and set progressGroup's status
 func validateProcessGroups(ctx context.Context, r *FoundationDBClusterReconciler, cluster *fdbv1beta2.FoundationDBCluster, status *fdbv1beta2.FoundationDBClusterStatus, processMap map[fdbv1beta2.ProcessGroupID][]fdbv1beta2.FoundationDBStatusProcessInfo, configMap *corev1.ConfigMap, pvcs *corev1.PersistentVolumeClaimList, logger logr.Logger) ([]*fdbv1beta2.ProcessGroupStatus, error) {
-<<<<<<< HEAD
-	var err error
-=======
-	nodeMap := make(map[string]*corev1.Node)
->>>>>>> 51dc84b6 (Refactor code to support multiple tLogs)
 	processGroups := status.ProcessGroups
 	processGroupsWithoutExclusion := make(map[fdbv1beta2.ProcessGroupID]fdbv1beta2.None, len(cluster.Spec.ProcessGroupsToRemoveWithoutExclusion))
 
@@ -435,7 +430,7 @@ func validateProcessGroups(ctx context.Context, r *FoundationDBClusterReconciler
 			continue
 		}
 
-		processGroup.AddAddresses(podmanager.GetPublicIPs(pod, log), processGroup.IsMarkedForRemoval() || !status.Health.Available)
+		processGroup.AddAddresses(podmanager.GetPublicIPs(pod, logger), processGroup.IsMarkedForRemoval() || !status.Health.Available)
 
 		// In this case the Pod has a DeletionTimestamp and should be deleted.
 		if !pod.ObjectMeta.DeletionTimestamp.IsZero() {

diff --git a/e2e/fixtures/fdb_cluster_specs.go b/e2e/fixtures/fdb_cluster_specs.go
@@ -38,6 +38,7 @@ func (factory *Factory) GenerateFDBClusterSpec(config *ClusterConfig) *fdbv1beta
 		factory.createProcesses(config),
 		config.CreateDatabaseConfiguration(),
 		config.StorageServerPerPod,
+		config.LogServersPerPod,
 		mainOverrides,
 		sidecarOverrides)
 }