Merge pull request #32584 from chrischdi/pr-capv-improve-resource-con…

…sumption CAPV: adjust resource consumption for jobs on community cluster
kubernetes · May 10, 2024 · 7138b3a · 7138b3a
2 parents c7c4e88 + c48721a
commit 7138b3a
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 64 deletions.
diff --git a/...rnetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-periodics.yaml b/...rnetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-periodics.yaml
@@ -116,10 +116,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-e2e-vcsim-govmomi-main
@@ -296,10 +296,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-e2e-vcsim-supervisor-main
@@ -435,10 +435,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "4Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-test-coverage-main

diff --git a/...netes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-presubmits.yaml b/...netes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-main-presubmits.yaml
@@ -21,10 +21,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-apidiff-main
@@ -53,10 +53,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-verify-main
@@ -197,10 +197,10 @@ presubmits:
         resources:
           requests:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
           limits:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-e2e-vcsim-govmomi-main
@@ -426,10 +426,10 @@ presubmits:
         resources:
           requests:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
           limits:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-e2e-vcsim-supervisor-main

diff --git a/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-10-periodics.yaml b/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-10-periodics.yaml
@@ -116,10 +116,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-e2e-vcsim-govmomi-release-1-10
@@ -296,10 +296,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-e2e-vcsim-supervisor-release-1-10

diff --git a/...gs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-10-presubmits.yaml b/...gs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-10-presubmits.yaml
@@ -21,10 +21,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-apidiff-release-1-10
@@ -53,10 +53,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-verify-release-1-10
@@ -197,10 +197,10 @@ presubmits:
         resources:
           requests:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
           limits:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-e2e-vcsim-govmomi-release-1-10
@@ -426,10 +426,10 @@ presubmits:
         resources:
           requests:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
           limits:
             cpu: "4000m"
-            memory: "6Gi"
+            memory: "3Gi"
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-e2e-vcsim-supervisor-release-1-10

diff --git a/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-7-periodics.yaml b/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-7-periodics.yaml
@@ -62,10 +62,10 @@ periodics:
       resources:
         limits:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
         requests:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
       command:
       - runner.sh
       args:

diff --git a/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-7-presubmits.yaml b/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-7-presubmits.yaml
@@ -21,10 +21,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-apidiff-release-1-7
@@ -53,10 +53,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-verify-release-1-7
@@ -113,10 +113,10 @@ presubmits:
         resources:
           limits:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
           requests:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
         command:
         - runner.sh
         args:

diff --git a/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-8-periodics.yaml b/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-8-periodics.yaml
@@ -62,10 +62,10 @@ periodics:
       resources:
         limits:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
         requests:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
       command:
       - runner.sh
       args:

diff --git a/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-8-presubmits.yaml b/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-8-presubmits.yaml
@@ -21,10 +21,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-apidiff-release-1-8
@@ -53,10 +53,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-verify-release-1-8
@@ -113,10 +113,10 @@ presubmits:
         resources:
           limits:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
           requests:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
         command:
         - runner.sh
         args:

diff --git a/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-9-periodics.yaml b/...sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-9-periodics.yaml
@@ -62,10 +62,10 @@ periodics:
       resources:
         limits:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
         requests:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
       command:
       - runner.sh
       args:

diff --git a/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-9-presubmits.yaml b/...igs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-9-presubmits.yaml
@@ -21,10 +21,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-apidiff-release-1-9
@@ -53,10 +53,10 @@ presubmits:
         resources:
           limits:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
           requests:
             cpu: 2
-            memory: 4Gi
+            memory: 3Gi
     annotations:
       testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
       testgrid-tab-name: pr-verify-release-1-9
@@ -113,10 +113,10 @@ presubmits:
         resources:
           limits:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
           requests:
             cpu: 4
-            memory: 6Gi
+            memory: 3Gi
         command:
         - runner.sh
         args:

diff --git a/...gs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics.yaml.tpl b/...gs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics.yaml.tpl
@@ -62,10 +62,10 @@ periodics:
       resources:
         limits:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
         requests:
           cpu: 4
-          memory: 6Gi
+          memory: 3Gi
       command:
       - runner.sh
       args:
@@ -177,10 +177,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "3Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-e2e-vcsim-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}
@@ -331,10 +331,10 @@ periodics:
       resources:
         requests:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "4Gi"
         limits:
           cpu: "4000m"
-          memory: "6Gi"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
     testgrid-tab-name: periodic-test-coverage-{{ ReplaceAll $.branch "." "-" }}