mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 01:40:07 +00:00
Merge pull request #39237 from NickrenREN/pod-manager
Automatic merge from submit-queue (batch tested with PRs 39092, 39126, 37380, 37093, 39237) Add unit test function to test DeletePod
This commit is contained in:
commit
1cee8c45d6
@ -39,5 +39,6 @@ go_test(
|
|||||||
"//pkg/kubelet/container:go_default_library",
|
"//pkg/kubelet/container:go_default_library",
|
||||||
"//pkg/kubelet/pod/testing:go_default_library",
|
"//pkg/kubelet/pod/testing:go_default_library",
|
||||||
"//pkg/kubelet/types:go_default_library",
|
"//pkg/kubelet/types:go_default_library",
|
||||||
|
"//pkg/types:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/api/v1"
|
"k8s.io/kubernetes/pkg/api/v1"
|
||||||
podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing"
|
podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing"
|
||||||
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
|
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
|
||||||
|
"k8s.io/kubernetes/pkg/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Stub out mirror client for testing purpose.
|
// Stub out mirror client for testing purpose.
|
||||||
@ -108,3 +109,58 @@ func TestGetSetPods(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDeletePods(t *testing.T) {
|
||||||
|
mirrorPod := &v1.Pod{
|
||||||
|
ObjectMeta: v1.ObjectMeta{
|
||||||
|
UID: types.UID("mirror-pod-uid"),
|
||||||
|
Name: "mirror-static-pod-name",
|
||||||
|
Namespace: v1.NamespaceDefault,
|
||||||
|
Annotations: map[string]string{
|
||||||
|
kubetypes.ConfigSourceAnnotationKey: "api",
|
||||||
|
kubetypes.ConfigMirrorAnnotationKey: "mirror",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
staticPod := &v1.Pod{
|
||||||
|
ObjectMeta: v1.ObjectMeta{
|
||||||
|
UID: types.UID("static-pod-uid"),
|
||||||
|
Name: "mirror-static-pod-name",
|
||||||
|
Namespace: v1.NamespaceDefault,
|
||||||
|
Annotations: map[string]string{kubetypes.ConfigSourceAnnotationKey: "file"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedPods := []*v1.Pod{
|
||||||
|
{
|
||||||
|
ObjectMeta: v1.ObjectMeta{
|
||||||
|
UID: types.UID("extra-pod-uid"),
|
||||||
|
Name: "extra-pod-name",
|
||||||
|
Namespace: v1.NamespaceDefault,
|
||||||
|
Annotations: map[string]string{kubetypes.ConfigSourceAnnotationKey: "api"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
staticPod,
|
||||||
|
}
|
||||||
|
updates := append(expectedPods, mirrorPod)
|
||||||
|
podManager, _ := newTestManager()
|
||||||
|
podManager.SetPods(updates)
|
||||||
|
|
||||||
|
podManager.DeletePod(staticPod)
|
||||||
|
|
||||||
|
actualPods := podManager.GetPods()
|
||||||
|
if len(actualPods) == len(expectedPods) {
|
||||||
|
t.Fatalf("Run DeletePod() error, expected %d pods, got %d pods; ", len(expectedPods)-1, len(actualPods))
|
||||||
|
}
|
||||||
|
|
||||||
|
orphanedMirrorPodNames := podManager.getOrphanedMirrorPodNames()
|
||||||
|
expectedOrphanedMirrorPodNameNum := 1
|
||||||
|
if len(orphanedMirrorPodNames) != expectedOrphanedMirrorPodNameNum {
|
||||||
|
t.Fatalf("Run getOrphanedMirrorPodNames() error, expected %d orphaned mirror pods, got %d orphaned mirror pods; ", expectedOrphanedMirrorPodNameNum, len(orphanedMirrorPodNames))
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedOrphanedMirrorPodName := mirrorPod.Name + "_" + mirrorPod.Namespace
|
||||||
|
if orphanedMirrorPodNames[0] != expectedOrphanedMirrorPodName {
|
||||||
|
t.Fatalf("Run getOrphanedMirrorPodNames() error, expected orphaned mirror pod name : %s, got orphaned mirror pod name %s; ", expectedOrphanedMirrorPodName, orphanedMirrorPodNames[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user