github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

podUnknown is marked as Obsolete

Browse Source
This commit is contained in:
Sergey Kanzhelev 2021-03-03 05:35:13 +00:00
parent b0abe89ae2
commit 4b05fe6644
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/core/types.go
View File

@ -2304,6 +2304,7 @@ const (
PodFailed PodPhase = "Failed" PodFailed PodPhase = "Failed"
// PodUnknown means that for some reason the state of the pod could not be obtained, typically due // PodUnknown means that for some reason the state of the pod could not be obtained, typically due
// to an error in communicating with the host of the pod. // to an error in communicating with the host of the pod.
// Deprecated in v1.21: It isn't being set since 2015 (74da3b14b0c0f658b3bb8d2def5094686d0e9095)
PodUnknown PodPhase = "Unknown" PodUnknown PodPhase = "Unknown"
) )

6
pkg/controller/deployment/recreate.go
View File

@ -18,7 +18,7 @@ package deployment
import ( import (
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/controller/deployment/util"
@ -110,7 +110,9 @@ func oldPodsRunning(newRS *apps.ReplicaSet, oldRSs []*apps.ReplicaSet, podMap ma
// Don't count pods in terminal state. // Don't count pods in terminal state.
continue continue
case v1.PodUnknown: case v1.PodUnknown:
// This happens in situation like when the node is temporarily disconnected from the cluster. // v1.PodUnknown is a deprecated status.
// This logic is kept for backward compatibility.
// This used to happen in situation like when the node is temporarily disconnected from the cluster.
// If we can't be sure that the pod is not running, we have to count it. // If we can't be sure that the pod is not running, we have to count it.
return true return true
default: default:

1
staging/src/k8s.io/api/core/v1/types.go
View File

@ -2522,6 +2522,7 @@ const (
PodFailed PodPhase = "Failed" PodFailed PodPhase = "Failed"
// PodUnknown means that for some reason the state of the pod could not be obtained, typically due // PodUnknown means that for some reason the state of the pod could not be obtained, typically due
// to an error in communicating with the host of the pod. // to an error in communicating with the host of the pod.
// Deprecated: It isn't being set since 2015 (74da3b14b0c0f658b3bb8d2def5094686d0e9095)
PodUnknown PodPhase = "Unknown" PodUnknown PodPhase = "Unknown"
) )

3
test/e2e/common/node/container.go
View File

@ -91,7 +91,8 @@ func (cc *ConformanceContainer) IsReady() (bool, error) {
func (cc *ConformanceContainer) GetPhase() (v1.PodPhase, error) { func (cc *ConformanceContainer) GetPhase() (v1.PodPhase, error) {
pod, err := cc.PodClient.Get(context.TODO(), cc.podName, metav1.GetOptions{}) pod, err := cc.PodClient.Get(context.TODO(), cc.podName, metav1.GetOptions{})
if err != nil { if err != nil {
return v1.PodUnknown, err // it doesn't matter what phase to return as error would not be nil
return v1.PodSucceeded, err
} }
return pod.Status.Phase, nil return pod.Status.Phase, nil
} }

6
test/e2e/storage/persistent_volumes-local.go
View File

@ -605,8 +605,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
defer podsLock.Unlock() defer podsLock.Unlock()
for _, pod := range podsList.Items { for _, pod := range podsList.Items {
switch pod.Status.Phase { if pod.Status.Phase == v1.PodSucceeded {
case v1.PodSucceeded:
// Delete pod and its PVCs // Delete pod and its PVCs
if err := deletePodAndPVCs(config, &pod); err != nil { if err := deletePodAndPVCs(config, &pod); err != nil {
return false, err return false, err
@ -614,9 +613,6 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
delete(pods, pod.Name) delete(pods, pod.Name)
numFinished++ numFinished++
framework.Logf("%v/%v pods finished", numFinished, totalPods) framework.Logf("%v/%v pods finished", numFinished, totalPods)
case v1.PodUnknown:
return false, fmt.Errorf("pod %v is in %v phase", pod.Name, pod.Status.Phase)
case v1.PodFailed:
} }
} }