Просмотр исходного кода

remove terminated status -> fail

Feroze Mohideen 2 лет назад
Родитель
Сommit
9c2822147e
2 измененных файлов с 5 добавлено и 6 удалено
  1. 1 3
      dashboard/src/lib/hooks/useAppStatus.ts
  2. 4 3
      internal/porter_app/status.go

+ 1 - 3
dashboard/src/lib/hooks/useAppStatus.ts

@@ -162,9 +162,7 @@ export const useAppStatus = ({
             )} ${pluralize(
               "is",
               pendingInstances.length
-            )} in a pending state at Version ${
-              revisionStatus.revision_number
-            }.`,
+            )} in a pending state at Version ${revisionStatus.revision_number}`,
             crashLoopReason: "",
             restartCount: _.maxBy(pendingInstances, "restart_count")
               ?.restart_count,

+ 4 - 3
internal/porter_app/status.go

@@ -168,6 +168,10 @@ func revisionStatusFromPods(ctx context.Context, inp revisionStatusFromPodsInput
 			telemetry.WithAttributes(span, telemetry.AttributeKV{Key: "revision-id", Value: revisionId})
 			return revisionStatusList, telemetry.Error(ctx, span, err, "error getting revision number from revision id")
 		}
+		// no number for this revision yet, so skip it from reporting
+		if revisionNumber == 0 {
+			continue
+		}
 		revisionStatus := RevisionStatus{
 			RevisionID:         revisionId,
 			RevisionNumber:     revisionNumber,
@@ -223,9 +227,6 @@ func instanceStatusFromPod(ctx context.Context, inp instanceStatusFromPodInput)
 	if appContainerStatus.State.Waiting != nil && appContainerStatus.State.Waiting.Reason == CrashLoopBackOff {
 		instanceStatus.Status = InstanceStatusDescriptor_Failed
 	}
-	if appContainerStatus.State.Terminated != nil {
-		instanceStatus.Status = InstanceStatusDescriptor_Failed
-	}
 
 	return instanceStatus, nil
 }