github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.36

Browse Source
This commit is contained in:
Kubernetes Release Robot
2026-04-21 02:32:05 +00:00
parent b139cc7960 b31119d205
commit f18c99afe9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/memory_qos_test.go
View File

@@ -587,6 +587,9 @@ var _ = SIGDescribe("MemoryQoS", framework.WithSerial(), func() {
ginkgo.AfterEach(func(ctx context.Context) { restoreConfig(ctx) })
ginkgo.It("should reset memory protection to 0 when MemoryQoS is disabled", func(ctx context.Context) {
// See https://github.com/kubernetes/kubernetes/pull/138430 for details
ginkgo.Skip("skipping test until MemoryQoS rollback is resolved")
configureMemoryQoSWithPolicy(ctx, 0.9, kubeletconfig.TieredReservationMemoryReservationPolicy)
pod := memqosMakePod("memqos-rollback", f.Namespace.Name,