chore: rebasing off main and resolving conflicts (#2314)

Co-authored-by: Joshua Ward <joshua.l.ward@leidos.com>

internal/dao/pod.go

@@ -544,6 +544,10 @@ func (p *Pod) Sanitize(ctx context.Context, ns string) (int, error) {
 			fallthrough
 		case render.PhaseImagePullBackOff:
 			fallthrough
+		case render.PhaseContainerStatusUnknown:
+			fallthrough
+		case render.PhaseEvicted:
+			fallthrough
 		case render.PhaseOOMKilled:
 			// !!BOZO!! Might need to bump timeout otherwise rev limit if too many??
 			log.Debug().Msgf("Sanitizing %s:%s", pod.Namespace, pod.Name)

internal/render/pod.go

@@ -28,19 +28,21 @@ const (
 )
 
 const (
-	PhaseTerminating       = "Terminating"
+	PhaseTerminating            = "Terminating"
-	PhaseInitialized       = "Initialized"
+	PhaseInitialized            = "Initialized"
-	PhaseRunning           = "Running"
+	PhaseRunning                = "Running"
-	PhaseNotReady          = "NoReady"
+	PhaseNotReady               = "NoReady"
-	PhaseCompleted         = "Completed"
+	PhaseCompleted              = "Completed"
-	PhaseContainerCreating = "ContainerCreating"
+	PhaseContainerCreating      = "ContainerCreating"
-	PhasePodInitializing   = "PodInitializing"
+	PhasePodInitializing        = "PodInitializing"
-	PhaseUnknown           = "Unknown"
+	PhaseUnknown                = "Unknown"
-	PhaseCrashLoop         = "CrashLoopBackOff"
+	PhaseCrashLoop              = "CrashLoopBackOff"
-	PhaseError             = "Error"
+	PhaseError                  = "Error"
-	PhaseImagePullBackOff  = "ImagePullBackOff"
+	PhaseImagePullBackOff       = "ImagePullBackOff"
-	PhaseOOMKilled         = "OOMKilled"
+	PhaseOOMKilled              = "OOMKilled"
-	PhasePending           = "Pending"
+	PhasePending                = "Pending"
+	PhaseContainerStatusUnknown = "ContainerStatusUnknown"
+	PhaseEvicted                = "Evicted"
 )
 
 // Pod renders a K8s Pod to screen.