mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Cleanup verbose cAdvisor mocking in Kubelet unit tests
This commit is contained in:
parent
28b7809d2f
commit
5955b839ff
@ -28,6 +28,14 @@ type Fake struct {
|
|||||||
NodeName string
|
NodeName string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
FakeNumCores = 1
|
||||||
|
FakeMemoryCapacity = 4026531840
|
||||||
|
FakeKernelVersion = "3.16.0-0.bpo.4-amd64"
|
||||||
|
FakeContainerOsVersion = "Debian GNU/Linux 7 (wheezy)"
|
||||||
|
FakeDockerVersion = "1.5.0"
|
||||||
|
)
|
||||||
|
|
||||||
var _ cadvisor.Interface = new(Fake)
|
var _ cadvisor.Interface = new(Fake)
|
||||||
|
|
||||||
func (c *Fake) Start() error {
|
func (c *Fake) Start() error {
|
||||||
@ -54,14 +62,18 @@ func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) {
|
|||||||
// Simulate a machine with 1 core and 3.75GB of memory.
|
// Simulate a machine with 1 core and 3.75GB of memory.
|
||||||
// We set it to non-zero values to make non-zero-capacity machines in Kubemark.
|
// We set it to non-zero values to make non-zero-capacity machines in Kubemark.
|
||||||
return &cadvisorapi.MachineInfo{
|
return &cadvisorapi.MachineInfo{
|
||||||
NumCores: 1,
|
NumCores: FakeNumCores,
|
||||||
InstanceID: cadvisorapi.InstanceID(c.NodeName),
|
InstanceID: cadvisorapi.InstanceID(c.NodeName),
|
||||||
MemoryCapacity: 4026531840,
|
MemoryCapacity: FakeMemoryCapacity,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Fake) VersionInfo() (*cadvisorapi.VersionInfo, error) {
|
func (c *Fake) VersionInfo() (*cadvisorapi.VersionInfo, error) {
|
||||||
return new(cadvisorapi.VersionInfo), nil
|
return &cadvisorapi.VersionInfo{
|
||||||
|
KernelVersion: FakeKernelVersion,
|
||||||
|
ContainerOsVersion: FakeContainerOsVersion,
|
||||||
|
DockerVersion: FakeDockerVersion,
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Fake) ImagesFsInfo() (cadvisorapiv2.FsInfo, error) {
|
func (c *Fake) ImagesFsInfo() (cadvisorapiv2.FsInfo, error) {
|
||||||
|
@ -31,7 +31,6 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
cadvisorapi "github.com/google/cadvisor/info/v1"
|
cadvisorapi "github.com/google/cadvisor/info/v1"
|
||||||
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
|
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
||||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
@ -49,6 +48,7 @@ import (
|
|||||||
core "k8s.io/client-go/testing"
|
core "k8s.io/client-go/testing"
|
||||||
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
|
fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
|
||||||
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
|
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
|
||||||
|
cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/cm"
|
"k8s.io/kubernetes/pkg/kubelet/cm"
|
||||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
|
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
|
||||||
@ -359,27 +359,6 @@ func TestUpdateNewNodeStatus(t *testing.T) {
|
|||||||
NumCores: 2,
|
NumCores: 2,
|
||||||
MemoryCapacity: 10E9, // 10G
|
MemoryCapacity: 10E9, // 10G
|
||||||
}
|
}
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
mockCadvisor.On("Start").Return(nil)
|
|
||||||
mockCadvisor.On("MachineInfo").Return(machineInfo, nil)
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
}
|
|
||||||
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 5000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 5000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
maxAge := 0 * time.Second
|
|
||||||
options := cadvisorapiv2.RequestOptions{IdType: cadvisorapiv2.TypeName, Count: 2, Recursive: false, MaxAge: &maxAge}
|
|
||||||
mockCadvisor.On("ContainerInfoV2", "/", options).Return(map[string]cadvisorapiv2.ContainerInfo{}, nil)
|
|
||||||
kubelet.machineInfo = machineInfo
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
expectedNode := &v1.Node{
|
expectedNode := &v1.Node{
|
||||||
@ -432,8 +411,8 @@ func TestUpdateNewNodeStatus(t *testing.T) {
|
|||||||
MachineID: "123",
|
MachineID: "123",
|
||||||
SystemUUID: "abc",
|
SystemUUID: "abc",
|
||||||
BootID: "1b3",
|
BootID: "1b3",
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
KernelVersion: cadvisortest.FakeKernelVersion,
|
||||||
OSImage: "Debian GNU/Linux 7 (wheezy)",
|
OSImage: cadvisortest.FakeContainerOsVersion,
|
||||||
OperatingSystem: goruntime.GOOS,
|
OperatingSystem: goruntime.GOOS,
|
||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
@ -564,8 +543,6 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
kubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{existingNode}}).ReactionChain
|
kubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{existingNode}}).ReactionChain
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
mockCadvisor.On("Start").Return(nil)
|
|
||||||
machineInfo := &cadvisorapi.MachineInfo{
|
machineInfo := &cadvisorapi.MachineInfo{
|
||||||
MachineID: "123",
|
MachineID: "123",
|
||||||
SystemUUID: "abc",
|
SystemUUID: "abc",
|
||||||
@ -573,25 +550,6 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
|
|||||||
NumCores: 2,
|
NumCores: 2,
|
||||||
MemoryCapacity: 20E9,
|
MemoryCapacity: 20E9,
|
||||||
}
|
}
|
||||||
mockCadvisor.On("MachineInfo").Return(machineInfo, nil)
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
}
|
|
||||||
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 5000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 5000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
maxAge := 0 * time.Second
|
|
||||||
options := cadvisorapiv2.RequestOptions{IdType: cadvisorapiv2.TypeName, Count: 2, Recursive: false, MaxAge: &maxAge}
|
|
||||||
mockCadvisor.On("ContainerInfoV2", "/", options).Return(map[string]cadvisorapiv2.ContainerInfo{}, nil)
|
|
||||||
kubelet.machineInfo = machineInfo
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
expectedNode := &v1.Node{
|
expectedNode := &v1.Node{
|
||||||
@ -644,8 +602,8 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
|
|||||||
MachineID: "123",
|
MachineID: "123",
|
||||||
SystemUUID: "abc",
|
SystemUUID: "abc",
|
||||||
BootID: "1b3",
|
BootID: "1b3",
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
KernelVersion: cadvisortest.FakeKernelVersion,
|
||||||
OSImage: "Debian GNU/Linux 7 (wheezy)",
|
OSImage: cadvisortest.FakeContainerOsVersion,
|
||||||
OperatingSystem: goruntime.GOOS,
|
OperatingSystem: goruntime.GOOS,
|
||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
@ -795,8 +753,6 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
|
|||||||
kubeClient := testKubelet.fakeKubeClient
|
kubeClient := testKubelet.fakeKubeClient
|
||||||
existingNode := v1.Node{ObjectMeta: metav1.ObjectMeta{Name: testKubeletHostname}}
|
existingNode := v1.Node{ObjectMeta: metav1.ObjectMeta{Name: testKubeletHostname}}
|
||||||
kubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{existingNode}}).ReactionChain
|
kubeClient.ReactionChain = fake.NewSimpleClientset(&v1.NodeList{Items: []v1.Node{existingNode}}).ReactionChain
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
mockCadvisor.On("Start").Return(nil)
|
|
||||||
machineInfo := &cadvisorapi.MachineInfo{
|
machineInfo := &cadvisorapi.MachineInfo{
|
||||||
MachineID: "123",
|
MachineID: "123",
|
||||||
SystemUUID: "abc",
|
SystemUUID: "abc",
|
||||||
@ -804,25 +760,6 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
|
|||||||
NumCores: 2,
|
NumCores: 2,
|
||||||
MemoryCapacity: 10E9,
|
MemoryCapacity: 10E9,
|
||||||
}
|
}
|
||||||
mockCadvisor.On("MachineInfo").Return(machineInfo, nil)
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
}
|
|
||||||
|
|
||||||
mockCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
maxAge := 0 * time.Second
|
|
||||||
options := cadvisorapiv2.RequestOptions{IdType: cadvisorapiv2.TypeName, Count: 2, Recursive: false, MaxAge: &maxAge}
|
|
||||||
mockCadvisor.On("ContainerInfoV2", "/", options).Return(map[string]cadvisorapiv2.ContainerInfo{}, nil)
|
|
||||||
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 10E9,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 20E9,
|
|
||||||
}, nil)
|
|
||||||
|
|
||||||
kubelet.machineInfo = machineInfo
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
expectedNode := &v1.Node{
|
expectedNode := &v1.Node{
|
||||||
@ -868,8 +805,8 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
|
|||||||
MachineID: "123",
|
MachineID: "123",
|
||||||
SystemUUID: "abc",
|
SystemUUID: "abc",
|
||||||
BootID: "1b3",
|
BootID: "1b3",
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
KernelVersion: cadvisortest.FakeKernelVersion,
|
||||||
OSImage: "Debian GNU/Linux 7 (wheezy)",
|
OSImage: cadvisortest.FakeContainerOsVersion,
|
||||||
OperatingSystem: goruntime.GOOS,
|
OperatingSystem: goruntime.GOOS,
|
||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
@ -1051,23 +988,6 @@ func TestRegisterWithApiServer(t *testing.T) {
|
|||||||
NumCores: 2,
|
NumCores: 2,
|
||||||
MemoryCapacity: 1024,
|
MemoryCapacity: 1024,
|
||||||
}
|
}
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
mockCadvisor.On("MachineInfo").Return(machineInfo, nil)
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
DockerVersion: "1.5.0",
|
|
||||||
}
|
|
||||||
mockCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 1000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 9,
|
|
||||||
Capacity: 10,
|
|
||||||
}, nil)
|
|
||||||
kubelet.machineInfo = machineInfo
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
done := make(chan struct{})
|
done := make(chan struct{})
|
||||||
@ -1279,27 +1199,6 @@ func TestUpdateNewNodeStatusTooLargeReservation(t *testing.T) {
|
|||||||
NumCores: 2,
|
NumCores: 2,
|
||||||
MemoryCapacity: 10E9, // 10G
|
MemoryCapacity: 10E9, // 10G
|
||||||
}
|
}
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
mockCadvisor.On("Start").Return(nil)
|
|
||||||
mockCadvisor.On("MachineInfo").Return(machineInfo, nil)
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
}
|
|
||||||
mockCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
maxAge := 0 * time.Second
|
|
||||||
options := cadvisorapiv2.RequestOptions{IdType: cadvisorapiv2.TypeName, Count: 2, Recursive: false, MaxAge: &maxAge}
|
|
||||||
mockCadvisor.On("ContainerInfoV2", "/", options).Return(map[string]cadvisorapiv2.ContainerInfo{}, nil)
|
|
||||||
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 3000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
mockCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{
|
|
||||||
Usage: 400,
|
|
||||||
Capacity: 3000,
|
|
||||||
Available: 600,
|
|
||||||
}, nil)
|
|
||||||
kubelet.machineInfo = machineInfo
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
expectedNode := &v1.Node{
|
expectedNode := &v1.Node{
|
||||||
|
@ -21,8 +21,6 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
cadvisorapi "github.com/google/cadvisor/info/v1"
|
|
||||||
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
|
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
apiequality "k8s.io/apimachinery/pkg/api/equality"
|
||||||
"k8s.io/apimachinery/pkg/api/resource"
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
@ -30,17 +28,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestPodResourceLimitsDefaulting(t *testing.T) {
|
func TestPodResourceLimitsDefaulting(t *testing.T) {
|
||||||
cpuCores := resource.MustParse("10")
|
|
||||||
memoryCapacity := resource.MustParse("10Gi")
|
|
||||||
tk := newTestKubelet(t, true)
|
tk := newTestKubelet(t, true)
|
||||||
defer tk.Cleanup()
|
defer tk.Cleanup()
|
||||||
tk.fakeCadvisor.On("VersionInfo").Return(&cadvisorapi.VersionInfo{}, nil)
|
|
||||||
tk.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{
|
|
||||||
NumCores: int(cpuCores.Value()),
|
|
||||||
MemoryCapacity: uint64(memoryCapacity.Value()),
|
|
||||||
}, nil)
|
|
||||||
tk.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
|
|
||||||
tk.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
|
|
||||||
tk.kubelet.nodeInfo = &testNodeInfo{
|
tk.kubelet.nodeInfo = &testNodeInfo{
|
||||||
nodes: []*v1.Node{
|
nodes: []*v1.Node{
|
||||||
{
|
{
|
||||||
|
@ -25,7 +25,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
cadvisorapi "github.com/google/cadvisor/info/v1"
|
cadvisorapi "github.com/google/cadvisor/info/v1"
|
||||||
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
@ -104,7 +103,6 @@ func (f *fakeImageGCManager) GetImageList() ([]kubecontainer.Image, error) {
|
|||||||
type TestKubelet struct {
|
type TestKubelet struct {
|
||||||
kubelet *Kubelet
|
kubelet *Kubelet
|
||||||
fakeRuntime *containertest.FakeRuntime
|
fakeRuntime *containertest.FakeRuntime
|
||||||
fakeCadvisor *cadvisortest.Mock
|
|
||||||
fakeKubeClient *fake.Clientset
|
fakeKubeClient *fake.Clientset
|
||||||
fakeMirrorClient *podtest.FakeMirrorClient
|
fakeMirrorClient *podtest.FakeMirrorClient
|
||||||
fakeClock *clock.FakeClock
|
fakeClock *clock.FakeClock
|
||||||
@ -118,11 +116,6 @@ func (tk *TestKubelet) Cleanup() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tk *TestKubelet) chainMock() {
|
|
||||||
tk.fakeCadvisor.On("ImagesFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
|
|
||||||
tk.fakeCadvisor.On("RootFsInfo").Return(cadvisorapiv2.FsInfo{}, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// newTestKubelet returns test kubelet with two images.
|
// newTestKubelet returns test kubelet with two images.
|
||||||
func newTestKubelet(t *testing.T, controllerAttachDetachEnabled bool) *TestKubelet {
|
func newTestKubelet(t *testing.T, controllerAttachDetachEnabled bool) *TestKubelet {
|
||||||
imageList := []kubecontainer.Image{
|
imageList := []kubecontainer.Image{
|
||||||
@ -228,8 +221,9 @@ func newTestKubeletWithImageList(
|
|||||||
}
|
}
|
||||||
kubelet.daemonEndpoints = &v1.NodeDaemonEndpoints{}
|
kubelet.daemonEndpoints = &v1.NodeDaemonEndpoints{}
|
||||||
|
|
||||||
mockCadvisor := &cadvisortest.Mock{}
|
kubelet.cadvisor = &cadvisortest.Fake{}
|
||||||
kubelet.cadvisor = mockCadvisor
|
machineInfo, _ := kubelet.cadvisor.MachineInfo()
|
||||||
|
kubelet.machineInfo = machineInfo
|
||||||
|
|
||||||
fakeMirrorClient := podtest.NewFakeMirrorClient()
|
fakeMirrorClient := podtest.NewFakeMirrorClient()
|
||||||
secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient)
|
secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient)
|
||||||
@ -350,7 +344,7 @@ func newTestKubeletWithImageList(
|
|||||||
|
|
||||||
kubelet.AddPodSyncLoopHandler(activeDeadlineHandler)
|
kubelet.AddPodSyncLoopHandler(activeDeadlineHandler)
|
||||||
kubelet.AddPodSyncHandler(activeDeadlineHandler)
|
kubelet.AddPodSyncHandler(activeDeadlineHandler)
|
||||||
return &TestKubelet{kubelet, fakeRuntime, mockCadvisor, fakeKubeClient, fakeMirrorClient, fakeClock, nil, plug}
|
return &TestKubelet{kubelet, fakeRuntime, fakeKubeClient, fakeMirrorClient, fakeClock, nil, plug}
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTestPods(count int) []*v1.Pod {
|
func newTestPods(count int) []*v1.Pod {
|
||||||
@ -459,7 +453,6 @@ func checkPodStatus(t *testing.T, kl *Kubelet, pod *v1.Pod, phase v1.PodPhase) {
|
|||||||
func TestHandlePortConflicts(t *testing.T) {
|
func TestHandlePortConflicts(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
|
|
||||||
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
||||||
@ -506,7 +499,6 @@ func TestHandlePortConflicts(t *testing.T) {
|
|||||||
func TestHandleHostNameConflicts(t *testing.T) {
|
func TestHandleHostNameConflicts(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
|
|
||||||
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
||||||
@ -550,7 +542,6 @@ func TestHandleHostNameConflicts(t *testing.T) {
|
|||||||
func TestHandleNodeSelector(t *testing.T) {
|
func TestHandleNodeSelector(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
nodes := []*v1.Node{
|
nodes := []*v1.Node{
|
||||||
{
|
{
|
||||||
@ -593,7 +584,6 @@ func TestHandleNodeSelector(t *testing.T) {
|
|||||||
func TestHandleMemExceeded(t *testing.T) {
|
func TestHandleMemExceeded(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
nodes := []*v1.Node{
|
nodes := []*v1.Node{
|
||||||
{ObjectMeta: metav1.ObjectMeta{Name: testKubeletHostname},
|
{ObjectMeta: metav1.ObjectMeta{Name: testKubeletHostname},
|
||||||
@ -645,7 +635,6 @@ func TestHandleMemExceeded(t *testing.T) {
|
|||||||
func TestHandlePluginResources(t *testing.T) {
|
func TestHandlePluginResources(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
|
|
||||||
adjustedResource := v1.ResourceName("domain1.com/adjustedResource")
|
adjustedResource := v1.ResourceName("domain1.com/adjustedResource")
|
||||||
@ -780,13 +769,6 @@ func TestHandlePluginResources(t *testing.T) {
|
|||||||
func TestPurgingObsoleteStatusMapEntries(t *testing.T) {
|
func TestPurgingObsoleteStatusMapEntries(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
versionInfo := &cadvisorapi.VersionInfo{
|
|
||||||
KernelVersion: "3.16.0-0.bpo.4-amd64",
|
|
||||||
ContainerOsVersion: "Debian GNU/Linux 7 (wheezy)",
|
|
||||||
DockerVersion: "1.5.0",
|
|
||||||
}
|
|
||||||
testKubelet.fakeCadvisor.On("VersionInfo").Return(versionInfo, nil)
|
|
||||||
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
pods := []*v1.Pod{
|
pods := []*v1.Pod{
|
||||||
@ -960,7 +942,6 @@ func TestCreateMirrorPod(t *testing.T) {
|
|||||||
for _, updateType := range []kubetypes.SyncPodType{kubetypes.SyncPodCreate, kubetypes.SyncPodUpdate} {
|
for _, updateType := range []kubetypes.SyncPodType{kubetypes.SyncPodCreate, kubetypes.SyncPodUpdate} {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
manager := testKubelet.fakeMirrorClient
|
manager := testKubelet.fakeMirrorClient
|
||||||
@ -983,7 +964,6 @@ func TestCreateMirrorPod(t *testing.T) {
|
|||||||
func TestDeleteOutdatedMirrorPod(t *testing.T) {
|
func TestDeleteOutdatedMirrorPod(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
manager := testKubelet.fakeMirrorClient
|
manager := testKubelet.fakeMirrorClient
|
||||||
@ -1022,7 +1002,6 @@ func TestDeleteOutdatedMirrorPod(t *testing.T) {
|
|||||||
func TestDeleteOrphanedMirrorPods(t *testing.T) {
|
func TestDeleteOrphanedMirrorPods(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
manager := testKubelet.fakeMirrorClient
|
manager := testKubelet.fakeMirrorClient
|
||||||
@ -1101,20 +1080,10 @@ func TestGetContainerInfoForMirrorPods(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
containerID := "ab2cdf"
|
|
||||||
containerPath := fmt.Sprintf("/docker/%v", containerID)
|
|
||||||
containerInfo := cadvisorapi.ContainerInfo{
|
|
||||||
ContainerReference: cadvisorapi.ContainerReference{
|
|
||||||
Name: containerPath,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
fakeRuntime := testKubelet.fakeRuntime
|
fakeRuntime := testKubelet.fakeRuntime
|
||||||
mockCadvisor := testKubelet.fakeCadvisor
|
|
||||||
cadvisorReq := &cadvisorapi.ContainerInfoRequest{}
|
cadvisorReq := &cadvisorapi.ContainerInfoRequest{}
|
||||||
mockCadvisor.On("DockerContainer", containerID, cadvisorReq).Return(containerInfo, nil)
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
fakeRuntime.PodList = []*containertest.FakePod{
|
fakeRuntime.PodList = []*containertest.FakePod{
|
||||||
@ -1125,7 +1094,7 @@ func TestGetContainerInfoForMirrorPods(t *testing.T) {
|
|||||||
Containers: []*kubecontainer.Container{
|
Containers: []*kubecontainer.Container{
|
||||||
{
|
{
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
ID: kubecontainer.ContainerID{Type: "test", ID: containerID},
|
ID: kubecontainer.ContainerID{Type: "test", ID: "ab2cdf"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}},
|
}},
|
||||||
@ -1136,13 +1105,11 @@ func TestGetContainerInfoForMirrorPods(t *testing.T) {
|
|||||||
stats, err := kubelet.GetContainerInfo("qux_ns", "5678", "foo", cadvisorReq)
|
stats, err := kubelet.GetContainerInfo("qux_ns", "5678", "foo", cadvisorReq)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
require.NotNil(t, stats)
|
require.NotNil(t, stats)
|
||||||
mockCadvisor.AssertExpectations(t)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHostNetworkAllowed(t *testing.T) {
|
func TestHostNetworkAllowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1171,7 +1138,6 @@ func TestHostNetworkAllowed(t *testing.T) {
|
|||||||
func TestHostNetworkDisallowed(t *testing.T) {
|
func TestHostNetworkDisallowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1199,7 +1165,6 @@ func TestHostNetworkDisallowed(t *testing.T) {
|
|||||||
func TestHostPIDAllowed(t *testing.T) {
|
func TestHostPIDAllowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1228,7 +1193,6 @@ func TestHostPIDAllowed(t *testing.T) {
|
|||||||
func TestHostPIDDisallowed(t *testing.T) {
|
func TestHostPIDDisallowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1256,7 +1220,6 @@ func TestHostPIDDisallowed(t *testing.T) {
|
|||||||
func TestHostIPCAllowed(t *testing.T) {
|
func TestHostIPCAllowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1285,7 +1248,6 @@ func TestHostIPCAllowed(t *testing.T) {
|
|||||||
func TestHostIPCDisallowed(t *testing.T) {
|
func TestHostIPCDisallowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1313,7 +1275,6 @@ func TestHostIPCDisallowed(t *testing.T) {
|
|||||||
func TestPrivilegeContainerAllowed(t *testing.T) {
|
func TestPrivilegeContainerAllowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1339,7 +1300,6 @@ func TestPrivilegeContainerAllowed(t *testing.T) {
|
|||||||
func TestPrivilegedContainerDisallowed(t *testing.T) {
|
func TestPrivilegedContainerDisallowed(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
capabilities.SetForTests(capabilities.Capabilities{
|
capabilities.SetForTests(capabilities.Capabilities{
|
||||||
@ -1363,7 +1323,6 @@ func TestPrivilegedContainerDisallowed(t *testing.T) {
|
|||||||
func TestNetworkErrorsWithoutHostNetwork(t *testing.T) {
|
func TestNetworkErrorsWithoutHostNetwork(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
kubelet.runtimeState.setNetworkState(fmt.Errorf("simulated network error"))
|
kubelet.runtimeState.setNetworkState(fmt.Errorf("simulated network error"))
|
||||||
@ -1430,7 +1389,6 @@ func TestSyncPodsSetStatusToFailedForPodsThatRunTooLong(t *testing.T) {
|
|||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
fakeRuntime := testKubelet.fakeRuntime
|
fakeRuntime := testKubelet.fakeRuntime
|
||||||
testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil)
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
now := metav1.Now()
|
now := metav1.Now()
|
||||||
@ -1478,7 +1436,6 @@ func TestSyncPodsDoesNotSetPodsThatDidNotRunTooLongToFailed(t *testing.T) {
|
|||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
fakeRuntime := testKubelet.fakeRuntime
|
fakeRuntime := testKubelet.fakeRuntime
|
||||||
testKubelet.chainMock()
|
|
||||||
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
|
|
||||||
@ -1543,7 +1500,6 @@ func podWithUIDNameNsSpec(uid types.UID, name, namespace string, spec v1.PodSpec
|
|||||||
func TestDeletePodDirsForDeletedPods(t *testing.T) {
|
func TestDeletePodDirsForDeletedPods(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
pods := []*v1.Pod{
|
pods := []*v1.Pod{
|
||||||
podWithUIDNameNs("12345678", "pod1", "ns"),
|
podWithUIDNameNs("12345678", "pod1", "ns"),
|
||||||
@ -1579,7 +1535,6 @@ func syncAndVerifyPodDir(t *testing.T, testKubelet *TestKubelet, pods []*v1.Pod,
|
|||||||
func TestDoesNotDeletePodDirsForTerminatedPods(t *testing.T) {
|
func TestDoesNotDeletePodDirsForTerminatedPods(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
pods := []*v1.Pod{
|
pods := []*v1.Pod{
|
||||||
podWithUIDNameNs("12345678", "pod1", "ns"),
|
podWithUIDNameNs("12345678", "pod1", "ns"),
|
||||||
@ -1598,7 +1553,6 @@ func TestDoesNotDeletePodDirsForTerminatedPods(t *testing.T) {
|
|||||||
func TestDoesNotDeletePodDirsIfContainerIsRunning(t *testing.T) {
|
func TestDoesNotDeletePodDirsIfContainerIsRunning(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
runningPod := &kubecontainer.Pod{
|
runningPod := &kubecontainer.Pod{
|
||||||
ID: "12345678",
|
ID: "12345678",
|
||||||
Name: "pod1",
|
Name: "pod1",
|
||||||
@ -1658,7 +1612,6 @@ func TestGetPodsToSync(t *testing.T) {
|
|||||||
func TestGenerateAPIPodStatusWithSortedContainers(t *testing.T) {
|
func TestGenerateAPIPodStatusWithSortedContainers(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
numContainers := 10
|
numContainers := 10
|
||||||
expectedOrder := []string{}
|
expectedOrder := []string{}
|
||||||
@ -1718,7 +1671,6 @@ func TestGenerateAPIPodStatusWithReasonCache(t *testing.T) {
|
|||||||
emptyContainerID := (&kubecontainer.ContainerID{}).String()
|
emptyContainerID := (&kubecontainer.ContainerID{}).String()
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
pod := podWithUIDNameNs("12345678", "foo", "new")
|
pod := podWithUIDNameNs("12345678", "foo", "new")
|
||||||
pod.Spec = v1.PodSpec{RestartPolicy: v1.RestartPolicyOnFailure}
|
pod.Spec = v1.PodSpec{RestartPolicy: v1.RestartPolicyOnFailure}
|
||||||
@ -1905,7 +1857,6 @@ func TestGenerateAPIPodStatusWithDifferentRestartPolicies(t *testing.T) {
|
|||||||
emptyContainerID := (&kubecontainer.ContainerID{}).String()
|
emptyContainerID := (&kubecontainer.ContainerID{}).String()
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kubelet := testKubelet.kubelet
|
kubelet := testKubelet.kubelet
|
||||||
pod := podWithUIDNameNs("12345678", "foo", "new")
|
pod := podWithUIDNameNs("12345678", "foo", "new")
|
||||||
containers := []v1.Container{{Name: "succeed"}, {Name: "failed"}}
|
containers := []v1.Container{{Name: "succeed"}, {Name: "failed"}}
|
||||||
@ -2069,7 +2020,6 @@ func (a *testPodAdmitHandler) Admit(attrs *lifecycle.PodAdmitAttributes) lifecyc
|
|||||||
func TestHandlePodAdditionsInvokesPodAdmitHandlers(t *testing.T) {
|
func TestHandlePodAdditionsInvokesPodAdmitHandlers(t *testing.T) {
|
||||||
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
|
||||||
defer testKubelet.Cleanup()
|
defer testKubelet.Cleanup()
|
||||||
testKubelet.chainMock()
|
|
||||||
kl := testKubelet.kubelet
|
kl := testKubelet.kubelet
|
||||||
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
kl.nodeInfo = testNodeInfo{nodes: []*v1.Node{
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user