Merge pull request #6557 from kiryl-filatau:aws-5k-fix

PiperOrigin-RevId: 904559722

Author: copybara-github

perfkitbenchmarker/providers/aws/elastic_kubernetes_service.py

@@ -993,6 +993,29 @@ def _DefaultNodepoolInstanceTypes() -> list[str]:
   def _PostCreate(self):
     """Performs post-creation steps for the cluster."""
     super()._PostCreate()
+    if FLAGS.eks_tune_vpc_cni_for_scale:
+      logging.info('Tuning aws-node (VPC CNI) for kubernetes_node_scale')
+      kubectl.RunKubectlCommand([
+          'set',
+          'env',
+          'daemonset/aws-node',
+          '-n',
+          'kube-system',
+          'WARM_ENI_TARGET=0',
+          'WARM_IP_TARGET=1',
+          'MINIMUM_IP_TARGET=1',
+      ])
+      kubectl.RunRetryableKubectlCommand(
+          [
+              'rollout',
+              'status',
+              'daemonset/aws-node',
+              '-n',
+              'kube-system',
+              '--timeout=%ds' % vm_util.DEFAULT_TIMEOUT,
+          ],
+          timeout=vm_util.DEFAULT_TIMEOUT,
+      )
     # Karpenter controller resources: default 1/1Gi; scale up when
     # node_scale target exceeds 1000 nodes.
     num_nodes = getattr(FLAGS, 'kubernetes_scale_num_nodes', None)

perfkitbenchmarker/providers/aws/flags.py

@@ -246,6 +246,14 @@
     'Comma-separated EC2 types for the Karpenter default NodePool (worker '
     'nodes only). Empty keeps instance-category/generation in the template.',
 )
+flags.DEFINE_boolean(
+    'eks_tune_vpc_cni_for_scale',
+    False,
+    'Tune aws-node DaemonSet warm-pool settings (WARM_ENI_TARGET=0, '
+    'WARM_IP_TARGET=1, MINIMUM_IP_TARGET=1) after cluster creation. '
+    'Required when scaling to thousands of nodes to prevent subnet IP '
+    'exhaustion. Enable when running kubernetes_node_scale at large scale.',
+)
 AWS_CAPACITY_BLOCK_RESERVATION_ID = flags.DEFINE_string(
     'aws_capacity_block_reservation_id',
     None,