Skip to content

Commit 2e940d8

Browse files
committed
fix(swap_encryption/pr3): duplicate FLAGS, unused import, COS ref, EKS stub
- Remove duplicate FLAGS = flags.FLAGS - Remove unused import re - Add _configure_eks_kubelet_swap() stub (deferred to PR #6780) - Fix COS_CONTAINERD -> UBUNTU_CONTAINERD (r3472549985) - 7-job fio suite retained - pyink --line-length=80 pass
1 parent e8b8bad commit 2e940d8

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.
@@ -425,7 +425,7 @@ def Prepare(spec) -> None:
425425
426426
Step 2 (this function):
427427
a. Create the benchmark nodepool (n4-highmem-32 or c4-*-lssd) with
428-
COS_CONTAINERD, 80 000 IOPS, and a node startup script that configures
428+
UBUNTU_CONTAINERD, 80 000 IOPS, and a node startup script that configures
429429
dm-crypt swap at the OS level — before any pod is scheduled.
430430
b. Delete the dummy default nodepool to stop its cost immediately.
431431
c. Deploy the privileged DaemonSet (pinned via nodeSelector to the
@@ -1063,7 +1063,7 @@ def _create_benchmark_node_pool(cluster) -> None:
10631063
10641064
Uses:
10651065
--swap_encryption_benchmark_machine_type (default n4-highmem-32)
1066-
--swap_encryption_node_image_type (default COS_CONTAINERD)
1066+
--swap_encryption_node_image_type (default UBUNTU_CONTAINERD)
10671067
--swap_encryption_boot_disk_iops (default 80000)
10681068
--swap_encryption_enable_dmcrypt (default True)
10691069

0 commit comments

Comments
 (0)