Put target health description into pod condition message

Author: alfredkrohmer

docs/guide/ingress/pod-conditions.md

@@ -91,10 +91,11 @@ nginx-test-5744b9ff84-7ftl9   1/1     Running   0          81s   10.1.2.3   ip-1
 If a readiness gate doesn't get ready, you can check the reason via:
 
 ```console
-$ kubectl get nginx-test-5744b9ff84-7ftl9 pod -o yaml | grep -B4 'type: target-health'
+$ kubectl get pod nginx-test-5744b9ff84-7ftl9 -o yaml | grep -B5 'type: target-health'
     - lastProbeTime: "2020-02-28T10:05:08Z"
       lastTransitionTime: "2020-02-28T10:05:08Z"
-      reason: "Elb.RegistrationInProgress: Target registration is in progress."
+      message: Target registration is in progress.
+      reason: Elb.RegistrationInProgress
       status: "False"
       type: target-health.alb.ingress.kubernetes.io/nginx-test_nginx-test_80
 ```

internal/alb/tg/targethealth.go

@@ -218,9 +218,10 @@ func (c *targetHealthController) reconcilePodCondition(ctx context.Context, cond
 	if cond == nil {
 		// new condition
 		targetHealthCondition := api.PodCondition{
-			Type:   conditionType,
-			Status: conditionStatus,
-			Reason: podConditionReason(targetHealth),
+			Type:    conditionType,
+			Status:  conditionStatus,
+			Reason:  aws.StringValue(targetHealth.Reason),
+			Message: aws.StringValue(targetHealth.Description),
 		}
 		if updateTimes {
 			targetHealthCondition.LastProbeTime = now
@@ -236,7 +237,8 @@ func (c *targetHealthController) reconcilePodCondition(ctx context.Context, cond
 			}
 		}
 		cond.Status = conditionStatus
-		cond.Reason = podConditionReason(targetHealth)
+		cond.Reason = aws.StringValue(targetHealth.Reason)
+		cond.Message = aws.StringValue(targetHealth.Description)
 		pod.Status.Conditions[i] = *cond
 	}
 
@@ -316,16 +318,6 @@ func podHasReadinessGate(pod *api.Pod, conditionType api.PodConditionType) bool
 	return false
 }
 
-func podConditionReason(targetHealth *elbv2.TargetHealth) string {
-	if targetHealth.Reason != nil {
-		if targetHealth.Description != nil {
-			return fmt.Sprintf("%s: %s", aws.StringValue(targetHealth.Reason), aws.StringValue(targetHealth.Description))
-		}
-		return aws.StringValue(targetHealth.Reason)
-	}
-	return ""
-}
-
 func podConditionForReadinessGate(pod *api.Pod, conditionType api.PodConditionType) (int, *api.PodCondition) {
 	for i, condition := range pod.Status.Conditions {
 		if condition.Type == conditionType {