Update k-csi gen-jobs to enable different clusters to be used

config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-driver-iscsi:
   - name: pull-kubernetes-csi-csi-driver-iscsi
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-driver-nfs:
   - name: pull-kubernetes-csi-csi-driver-nfs
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/csi-driver-nvmf/csi-driver-nvmf-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-driver-nvmf:
   - name: pull-kubernetes-csi-csi-driver-nvmf
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-lib-utils:
   - name: pull-kubernetes-csi-csi-lib-utils
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-proxy:
   - name: pull-kubernetes-csi-csi-proxy
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-release-tools:
   - name: pull-kubernetes-csi-csi-release-tools
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,8 +29,13 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-release-tools-csi-test
+    cluster: default
     always_run: true
     optional: true # cannot be required because updates in csi-release-tools may include breaking changes
     decorate: true
@@ -61,11 +67,16 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
         env:
         - name: PULL_TEST_REPO_DIR
           value: /home/prow/go/src/github.com/kubernetes-csi/csi-test
   - name: pull-kubernetes-csi-release-tools-external-provisioner
+    cluster: default
     always_run: true
     optional: true # cannot be required because updates in csi-release-tools may include breaking changes
     decorate: true
@@ -97,7 +108,11 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
         env:
         - name: PULL_TEST_REPO_DIR
           value: /home/prow/go/src/github.com/kubernetes-csi/external-provisioner
@@ -112,6 +127,7 @@ presubmits:
         - name: CSI_SNAPSHOTTER_VERSION
           value: "v6.1.0"
   - name: pull-kubernetes-csi-release-tools-external-snapshotter
+    cluster: eks-prow-build-cluster
     always_run: true
     optional: true # cannot be required because updates in csi-release-tools may include breaking changes
     decorate: true
@@ -143,7 +159,11 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
         env:
         - name: PULL_TEST_REPO_DIR
           value: /home/prow/go/src/github.com/kubernetes-csi/external-snapshotter
@@ -158,6 +178,7 @@ presubmits:
         - name: CSI_SNAPSHOTTER_VERSION
           value: "v6.1.0"
   - name: pull-kubernetes-csi-release-tools-csi-driver-host-path
+    cluster: default
     always_run: true
     optional: true # cannot be required because updates in csi-release-tools may include breaking changes
     decorate: true
@@ -189,7 +210,11 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
         env:
         - name: PULL_TEST_REPO_DIR
           value: /home/prow/go/src/github.com/kubernetes-csi/csi-driver-host-path

config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/csi-test:
   - name: pull-kubernetes-csi-csi-test
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2

config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/external-attacher:
   - name: pull-kubernetes-csi-external-attacher-1-24-on-kubernetes-1-24
+    cluster: default
     always_run: true
     optional: false
     decorate: true
@@ -47,11 +48,16 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-1-24-on-kubernetes-master
     # Explicitly needs to be started with /test.
     # This cannot be enabled by default because there's always the risk
     # that something changes in master which breaks the pre-merge check.
+    cluster: default
     always_run: false
     optional: true
     decorate: true
@@ -88,12 +94,13 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-1-25-on-kubernetes-1-25
+    cluster: default
     always_run: true
     optional: false
     decorate: true
@@ -138,11 +145,16 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-1-25-on-kubernetes-master
     # Explicitly needs to be started with /test.
     # This cannot be enabled by default because there's always the risk
     # that something changes in master which breaks the pre-merge check.
+    cluster: default
     always_run: false
     optional: true
     decorate: true
@@ -179,12 +191,13 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-1-26-on-kubernetes-1-26
+    cluster: default
     always_run: true
     optional: true
     decorate: true
@@ -229,15 +242,16 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-1-26-on-kubernetes-master
     # Explicitly needs to be started with /test.
     # This cannot be enabled by default because there's always the risk
     # that something changes in master which breaks the pre-merge check.
+    cluster: default
     always_run: false
     optional: true
     decorate: true
@@ -274,12 +288,13 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-alpha-1-25-on-kubernetes-1-25
+    cluster: default
     always_run: false
     optional: true
     decorate: true
@@ -324,8 +339,13 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2
   - name: pull-kubernetes-csi-external-attacher-unit
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -354,11 +374,11 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2
 
   - name: pull-kubernetes-csi-external-attacher-canary
     optional: true
@@ -405,8 +425,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            # these are both a bit below peak usage during build
-            # this is mostly for building kubernetes
-            memory: "9000Mi"
-            # during the tests more like 3-20m is used
-            cpu: 2000m
+            memory: "9Gi"
+            cpu: 2
+          limits:
+            memory: "9Gi"
+            cpu: 2

config/jobs/kubernetes-csi/external-health-monitor/external-health-monitor-config.yaml

@@ -3,6 +3,7 @@
 presubmits:
   kubernetes-csi/external-health-monitor:
   - name: pull-kubernetes-csi-external-health-monitor
+    cluster: default
     always_run: true
     decorate: true
     skip_report: false
@@ -28,4 +29,8 @@ presubmits:
           privileged: true
         resources:
           requests:
-            cpu: 2000m
+            memory: "4Gi"
+            cpu: 2
+          limits:
+            memory: "4Gi"
+            cpu: 2