K8SPG-454: set ready status when all pg pods are updated (#869)

* K8SPG-454: set ready status when all pg pods are updated

https://perconadev.atlassian.net/browse/K8SPG-454

* fix test

* fix envtest

* remove `.status.postgres.updated`

---------

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: pooknull

percona/controller/pgcluster/status.go

@@ -36,34 +36,36 @@ func (r *PGClusterReconciler) getHost(ctx context.Context, cr *v2.PerconaPGClust
 	return host, nil
 }
 
-func (r *PGClusterReconciler) getState(cr *v2.PerconaPGCluster, status *v1beta1.PostgresClusterStatus) v2.AppState {
-	var size, ready int
-	for _, is := range status.InstanceSets {
-		size = size + int(is.Replicas)
-		ready = ready + int(is.ReadyReplicas)
-	}
-
+func (r *PGClusterReconciler) getState(cr *v2.PerconaPGCluster, status *v2.PerconaPGClusterStatus, crunchyStatus *v1beta1.PostgresClusterStatus) v2.AppState {
 	if cr.Spec.Pause != nil && *cr.Spec.Pause {
-		if ready > 0 {
+		if status.Postgres.Ready > 0 {
 			return v2.AppStateStopping
 		}
 
 		return v2.AppStatePaused
 	}
 
-	if status.PGBackRest != nil && status.PGBackRest.RepoHost != nil && !status.PGBackRest.RepoHost.Ready {
+	if crunchyStatus.PGBackRest != nil && crunchyStatus.PGBackRest.RepoHost != nil && !crunchyStatus.PGBackRest.RepoHost.Ready {
+		return v2.AppStateInit
+	}
+
+	if status.PGBouncer.Ready != status.PGBouncer.Size {
 		return v2.AppStateInit
 	}
 
-	if status.Proxy.PGBouncer.ReadyReplicas != status.Proxy.PGBouncer.Replicas {
+	if status.Postgres.Ready != status.Postgres.Size {
 		return v2.AppStateInit
 	}
 
-	if ready < size {
+	var updatedPods int32
+	for _, is := range crunchyStatus.InstanceSets {
+		updatedPods += is.UpdatedReplicas
+	}
+	if updatedPods != status.Postgres.Size {
 		return v2.AppStateInit
 	}
 
-	if size == 0 {
+	if status.Postgres.Size == 0 {
 		return v2.AppStateInit
 	}
 
@@ -76,27 +78,17 @@ func (r *PGClusterReconciler) updateStatus(ctx context.Context, cr *v2.PerconaPG
 		return errors.Wrap(err, "get app host")
 	}
 
-	pgStatusFromCruncy := func() v2.PostgresStatus {
-		var size, ready int32
-		for _, is := range status.InstanceSets {
-			size = size + is.Replicas
-			ready = ready + is.ReadyReplicas
-		}
-
-		ss := make([]v2.PostgresInstanceSetStatus, 0, len(status.InstanceSets))
-		for _, is := range status.InstanceSets {
-			ss = append(ss, v2.PostgresInstanceSetStatus{
-				Name:  is.Name,
-				Size:  is.Replicas,
-				Ready: is.ReadyReplicas,
-			})
-		}
-
-		return v2.PostgresStatus{
-			Size:         size,
-			Ready:        ready,
-			InstanceSets: ss,
-		}
+	var size, ready int32
+	ss := make([]v2.PostgresInstanceSetStatus, 0, len(status.InstanceSets))
+	for _, is := range status.InstanceSets {
+		ss = append(ss, v2.PostgresInstanceSetStatus{
+			Name:  is.Name,
+			Size:  is.Replicas,
+			Ready: is.ReadyReplicas,
+		})
+
+		size += is.Replicas
+		ready += is.ReadyReplicas
 	}
 
 	if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
@@ -109,15 +101,20 @@ func (r *PGClusterReconciler) updateStatus(ctx context.Context, cr *v2.PerconaPG
 		}
 
 		cluster.Status = v2.PerconaPGClusterStatus{
-			Postgres: pgStatusFromCruncy(),
+			Postgres: v2.PostgresStatus{
+				Size:         size,
+				Ready:        ready,
+				InstanceSets: ss,
+			},
 			PGBouncer: v2.PGBouncerStatus{
 				Size:  status.Proxy.PGBouncer.Replicas,
 				Ready: status.Proxy.PGBouncer.ReadyReplicas,
 			},
-			State: r.getState(cr, status),
-			Host:  host,
+			Host: host,
 		}
 
+		cluster.Status.State = r.getState(cr, &cluster.Status, status)
+
 		return r.Client.Status().Update(ctx, cluster)
 	}); err != nil {
 		return errors.Wrap(err, "update PerconaPGCluster status")

percona/controller/pgcluster/status_test.go

@@ -151,7 +151,6 @@ var _ = Describe("PG Cluster status", Ordered, func() {
 
 		When("PGBackRest RepoHost is not ready", func() {
 			It("state should be initializing", func() {
-
 				updateCrunchyPGClusterStatus(ctx, crNamespacedName, func(pgc *v1beta1.PostgresCluster) {
 					pgc.Status.PGBackRest = &v1beta1.PGBackRestStatus{
 						RepoHost: &v1beta1.RepoHostStatus{Ready: false},
@@ -229,6 +228,7 @@ var _ = Describe("PG Cluster status", Ordered, func() {
 					pgc.Status.PGBackRest.RepoHost.Ready = true
 					pgc.Status.Proxy.PGBouncer.ReadyReplicas = 1
 					pgc.Status.InstanceSets[0].ReadyReplicas = 1
+					pgc.Status.InstanceSets[0].UpdatedReplicas = 1
 				})
 
 				reconcileAndAssertState(ctx, crNamespacedName, cr, v2.AppStateReady)
@@ -300,10 +300,9 @@ var _ = Describe("PG Cluster status", Ordered, func() {
 					err := k8sClient.Get(ctx, client.ObjectKeyFromObject(pgBouncerSVC), pgBouncerSVC)
 					return err == nil
 				}, time.Second*15, time.Millisecond*250).Should(BeTrue())
-				pgBouncerSVC.Status.LoadBalancer.Ingress =
-					append(pgBouncerSVC.Status.LoadBalancer.Ingress, corev1.LoadBalancerIngress{
-						IP: "22.22.22.22",
-					})
+				pgBouncerSVC.Status.LoadBalancer.Ingress = append(pgBouncerSVC.Status.LoadBalancer.Ingress, corev1.LoadBalancerIngress{
+					IP: "22.22.22.22",
+				})
 				Expect(k8sClient.Status().Update(ctx, pgBouncerSVC)).Should(Succeed())
 
 				_, err = reconciler(cr).Reconcile(ctx, ctrl.Request{NamespacedName: crNamespacedName})