Merge branch 'main' into ebeaty_uprev_ami

ios-xr · Jan 9, 2025 · ed259f6 · ed259f6
2 parents 2373d79 + 0e0f5f5
commit ed259f6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -150,7 +150,7 @@ locals {
 }
 
 locals {
-  minimal_hugepages_gb = 4
+  minimal_hugepages_gb = 6
   maximal_hugepages_gb = 6
 
   hugepages_gb = try(