Skip to content

Commit 84bd9d7

Browse files
committed
fix(swap_encryption/pr5): EKS stub, DaemonSet alignment, COS ref fix
- Add _configure_eks_kubelet_swap() stub (deferred to PR #6780) - DaemonSet: aligned with PR4 slim (no redis/memtier/esrally/opensearch) - Kernel source pre-fetch retained for Phase 3b kernel build - Fix COS_CONTAINERD -> UBUNTU_CONTAINERD (r3472549985) - re import retained (used in _parse_redis_benchmark)
1 parent 06486f2 commit 84bd9d7

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

perfkitbenchmarker/linux_benchmarks/swap_encryption_benchmark.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
GKE vs. EKS swap encryption and LSSD performance comparison.
9393
Two-step nodepool setup: PKB provisions a minimal cluster with a cheap
9494
default nodepool (Step 1), then Prepare() adds the real benchmark
95-
nodepool (n4-highmem-32 / c4-*-lssd, COS_CONTAINERD, 80k IOPS) with a
95+
nodepool (n4-highmem-32 / c4-*-lssd, UBUNTU_CONTAINERD, 80k IOPS) with a
9696
node-level startup script that configures dm-crypt swap before any pod
9797
is scheduled, then removes the default nodepool (Step 2). All benchmark
9898
phases run inside a privileged DaemonSet pinned to the benchmark nodepool.
@@ -474,7 +474,7 @@ def Prepare(spec) -> None:
474474
475475
Step 2 (this function):
476476
a. Create the benchmark nodepool (n4-highmem-32 or c4-*-lssd) with
477-
COS_CONTAINERD, 80 000 IOPS, and a node startup script that configures
477+
UBUNTU_CONTAINERD, 80 000 IOPS, and a node startup script that configures
478478
dm-crypt swap at the OS level — before any pod is scheduled.
479479
b. Delete the dummy default nodepool to stop its cost immediately.
480480
c. Deploy the privileged DaemonSet (pinned via nodeSelector to the
@@ -1189,7 +1189,7 @@ def _create_benchmark_node_pool(cluster) -> None:
11891189
11901190
Uses:
11911191
--swap_encryption_benchmark_machine_type (default n4-highmem-32)
1192-
--swap_encryption_node_image_type (default COS_CONTAINERD)
1192+
--swap_encryption_node_image_type (default UBUNTU_CONTAINERD)
11931193
--swap_encryption_boot_disk_iops (default 80000)
11941194
--swap_encryption_enable_dmcrypt (default True)
11951195

0 commit comments

Comments
 (0)