github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121923 from saschagrunert/resources-windows

Browse Source 
Enable pod container resources tests on Windows
This commit is contained in:
Kubernetes Prow Robot 2024-02-05 08:45:08 -08:00 committed by GitHub
commit ce28021839
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kuberuntime/kuberuntime_container_test.go
View File

@ -236,10 +236,6 @@ func TestToKubeContainerStatus(t *testing.T) {
// TestToKubeContainerStatusWithResources tests the converting the CRI container status to // TestToKubeContainerStatusWithResources tests the converting the CRI container status to
// the internal type (i.e., toKubeContainerStatus()) for containers that returns Resources. // the internal type (i.e., toKubeContainerStatus()) for containers that returns Resources.
func TestToKubeContainerStatusWithResources(t *testing.T) { func TestToKubeContainerStatusWithResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)()
cid := &kubecontainer.ContainerID{Type: "testRuntime", ID: "dummyid"} cid := &kubecontainer.ContainerID{Type: "testRuntime", ID: "dummyid"}
meta := &runtimeapi.ContainerMetadata{Name: "cname", Attempt: 3} meta := &runtimeapi.ContainerMetadata{Name: "cname", Attempt: 3}
@ -848,10 +844,6 @@ func TestKillContainerGracePeriod(t *testing.T) {
// TestUpdateContainerResources tests updating a container in a Pod. // TestUpdateContainerResources tests updating a container in a Pod.
func TestUpdateContainerResources(t *testing.T) { func TestUpdateContainerResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
fakeRuntime, _, m, errCreate := createTestRuntimeManager() fakeRuntime, _, m, errCreate := createTestRuntimeManager()
require.NoError(t, errCreate) require.NoError(t, errCreate)
pod := &v1.Pod{ pod := &v1.Pod{

5
pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
View File

@ -21,7 +21,6 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"reflect" "reflect"
goruntime "runtime"
"sort" "sort"
"testing" "testing"
"time" "time"
@ -2466,10 +2465,6 @@ func TestComputePodActionsForPodResize(t *testing.T) {
} }
func TestUpdatePodContainerResources(t *testing.T) { func TestUpdatePodContainerResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)()
fakeRuntime, _, m, err := createTestRuntimeManager() fakeRuntime, _, m, err := createTestRuntimeManager()
m.machineInfo.MemoryCapacity = 17179860387 // 16GB m.machineInfo.MemoryCapacity = 17179860387 // 16GB