From 0e0f5f5bc538449d9a10f571db202d44f7b0e7a2 Mon Sep 17 00:00:00 2001 From: tjohnes Date: Wed, 8 Jan 2025 13:48:59 +0000 Subject: [PATCH] Update cloud router requirements (#26) Minimal cloud router should have 10GiB memory and 6GiB hugepages. Scale cloud router should have 16GiB memory. --- dev/flex/templates/values-vrouter.yaml.tftpl | 2 +- examples/overlay/workload/templates/xrd1.yaml.tftpl | 4 ++-- examples/overlay/workload/templates/xrd2.yaml.tftpl | 4 ++-- .../singleton/workload/templates/xrd-control-plane.yaml.tftpl | 1 - examples/singleton/workload/templates/xrd-vrouter.yaml.tftpl | 4 ++-- modules/aws/node-props/main.tf | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dev/flex/templates/values-vrouter.yaml.tftpl b/dev/flex/templates/values-vrouter.yaml.tftpl index a19c5ec..8da6541 100644 --- a/dev/flex/templates/values-vrouter.yaml.tftpl +++ b/dev/flex/templates/values-vrouter.yaml.tftpl @@ -7,7 +7,7 @@ xrd${i + 1}: pullPolicy: Always resources: limits: - memory: 8Gi + memory: 10Gi hugepages-1Gi: ${hugepages[node_name]}Gi securityContext: privileged: true diff --git a/examples/overlay/workload/templates/xrd1.yaml.tftpl b/examples/overlay/workload/templates/xrd1.yaml.tftpl index 1538f2c..4dc3dc4 100644 --- a/examples/overlay/workload/templates/xrd1.yaml.tftpl +++ b/examples/overlay/workload/templates/xrd1.yaml.tftpl @@ -3,8 +3,8 @@ image: tag: "${image_tag}" resources: limits: - memory: 8Gi - hugepages-1Gi: 3Gi + memory: 10Gi + hugepages-1Gi: 6Gi persistence: enabled: true storageClass: gp2 diff --git a/examples/overlay/workload/templates/xrd2.yaml.tftpl b/examples/overlay/workload/templates/xrd2.yaml.tftpl index fc46e8d..0c94d2b 100644 --- a/examples/overlay/workload/templates/xrd2.yaml.tftpl +++ b/examples/overlay/workload/templates/xrd2.yaml.tftpl @@ -3,8 +3,8 @@ image: tag: "${image_tag}" resources: limits: - memory: 8Gi - hugepages-1Gi: 3Gi + memory: 10Gi + hugepages-1Gi: 6Gi persistence: enabled: true storageClass: gp2 diff --git a/examples/singleton/workload/templates/xrd-control-plane.yaml.tftpl b/examples/singleton/workload/templates/xrd-control-plane.yaml.tftpl index 653447e..be60dea 100644 --- a/examples/singleton/workload/templates/xrd-control-plane.yaml.tftpl +++ b/examples/singleton/workload/templates/xrd-control-plane.yaml.tftpl @@ -4,7 +4,6 @@ image: resources: limits: memory: 8Gi - hugepages-1Gi: 3Gi persistence: enabled: true storageClass: gp2 diff --git a/examples/singleton/workload/templates/xrd-vrouter.yaml.tftpl b/examples/singleton/workload/templates/xrd-vrouter.yaml.tftpl index d73b0b2..c4e9c39 100644 --- a/examples/singleton/workload/templates/xrd-vrouter.yaml.tftpl +++ b/examples/singleton/workload/templates/xrd-vrouter.yaml.tftpl @@ -3,8 +3,8 @@ image: tag: "${image_tag}" resources: limits: - memory: 8Gi - hugepages-1Gi: 3Gi + memory: 10Gi + hugepages-1Gi: 6Gi persistence: enabled: true storageClass: gp2 diff --git a/modules/aws/node-props/main.tf b/modules/aws/node-props/main.tf index 361bf02..d6a3eb7 100644 --- a/modules/aws/node-props/main.tf +++ b/modules/aws/node-props/main.tf @@ -150,7 +150,7 @@ locals { } locals { - minimal_hugepages_gb = 4 + minimal_hugepages_gb = 6 maximal_hugepages_gb = 6 hugepages_gb = try(