From b430464df061a2c0a0b4a9f19b13fd5e85ba07e3 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Tue, 17 Jan 2023 18:12:34 +0100 Subject: [PATCH] gce: podresources: don't disable on windows Now that podresources socket has been fixed on windows, we can re-enable on GCE CI. Signed-off-by: Francesco Romani --- cluster/gce/util.sh | 4 ---- cluster/gce/windows/README-GCE-Windows-kube-up.md | 1 - 2 files changed, 5 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 54162fab14c..76008e4ca0d 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -861,10 +861,6 @@ function construct-windows-kubelet-flags { # Turn off kernel memory cgroup notification. flags+=" --kernel-memcg-notification=false" - # TODO(#78628): Re-enable KubeletPodResources when the issue is fixed. - # Force disable KubeletPodResources feature on Windows until #78628 is fixed. - flags+=" --feature-gates=KubeletPodResources=false" - WINDOWS_CONTAINER_RUNTIME_ENDPOINT=${KUBE_WINDOWS_CONTAINER_RUNTIME_ENDPOINT:-npipe:////./pipe/containerd-containerd} flags+=" --container-runtime-endpoint=${WINDOWS_CONTAINER_RUNTIME_ENDPOINT}" diff --git a/cluster/gce/windows/README-GCE-Windows-kube-up.md b/cluster/gce/windows/README-GCE-Windows-kube-up.md index 67adb6e0e38..2e709c7dff0 100644 --- a/cluster/gce/windows/README-GCE-Windows-kube-up.md +++ b/cluster/gce/windows/README-GCE-Windows-kube-up.md @@ -123,7 +123,6 @@ e2e test configuration for the latest environment variables. ```bash KUBE_GCE_ENABLE_IP_ALIASES=true KUBERNETES_NODE_PLATFORM=windows \ - KUBELET_TEST_ARGS=--feature-gates=KubeletPodResources=false \ LOGGING_STACKDRIVER_RESOURCE_TYPES=new NUM_NODES=2 \ NUM_WINDOWS_NODES=3 WINDOWS_NODE_OS_DISTRIBUTION=win2019 \ ./hack/e2e-internal/e2e-up.sh