From 760e9266f00fb9aca57da25066ec0c6064e600d1 Mon Sep 17 00:00:00 2001
From: Jun Gong <jungong@tencent.com>
Date: Thu, 10 Dec 2020 11:56:33 +0800
Subject: [PATCH] Update pod ready condtion to true if readiness gate is
 updated to true

---
 pkg/tapp/controller.go | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkg/tapp/controller.go b/pkg/tapp/controller.go
index c512131..565df3c 100644
--- a/pkg/tapp/controller.go
+++ b/pkg/tapp/controller.go
@@ -1189,6 +1189,9 @@ func setInPlaceUpdateCondition(kubeclient kubernetes.Interface, pod *corev1.Pod,
 			return
 		}
 
+		reason := "ReadinessGatesNotReady"
+		message := fmt.Sprintf("the status of pod readiness gate %q is not \"True\", but %v",
+			string(tappv1.InPlaceUpdateReady), corev1.ConditionFalse)
 		// If status is False, we also need to update Ready condition to False immediately
 		if status == corev1.ConditionFalse {
 			for i, c := range pod.Status.Conditions {
@@ -1196,10 +1199,20 @@ func setInPlaceUpdateCondition(kubeclient kubernetes.Interface, pod *corev1.Pod,
 					if c.Status != corev1.ConditionFalse {
 						pod.Status.Conditions[i].Status = corev1.ConditionFalse
 						pod.Status.Conditions[i].LastTransitionTime = metav1.Now()
-						pod.Status.Conditions[i].Reason = "ReadinessGatesNotReady"
-						pod.Status.Conditions[i].Message =
-							fmt.Sprintf("the status of pod readiness gate %q is not \"True\", but %v",
-								string(tappv1.InPlaceUpdateReady), corev1.ConditionFalse)
+						pod.Status.Conditions[i].Reason = reason
+						pod.Status.Conditions[i].Message = message
+					}
+					break
+				}
+			}
+		} else {
+			for i, c := range pod.Status.Conditions {
+				if c.Type == corev1.PodReady {
+					if c.Status == corev1.ConditionFalse && c.Reason == reason && c.Message == message {
+						pod.Status.Conditions[i].Status = corev1.ConditionTrue
+						pod.Status.Conditions[i].LastTransitionTime = metav1.Now()
+						pod.Status.Conditions[i].Reason = ""
+						pod.Status.Conditions[i].Message = ""
 					}
 					break
 				}