replace n1 machine with e2 machine type

elieserr · elieserr · commit f66b9881706e · 2025-07-07T09:31:09.000-03:00
diff --git a/config/jobs/kubernetes-sigs/sig-windows/windows-gce.yaml b/config/jobs/kubernetes-sigs/sig-windows/windows-gce.yaml
@@ -41,7 +41,7 @@ periodics:
       - name: WINDOWS_NODE_OS_DISTRIBUTION
         value: "win2019"
       - name: NODE_SIZE
-        value: "n1-standard-4"
+        value: "e2-standard-4"
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250702-e205934cd3-master
       resources:
         requests:
@@ -98,7 +98,7 @@ periodics:
       - name: WINDOWS_NODE_OS_DISTRIBUTION
         value: "win2022"
       - name: NODE_SIZE
-        value: "n1-standard-4"
+        value: "e2-standard-4"
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250702-e205934cd3-master
       resources:
         requests:
diff --git a/config/jobs/kubernetes/cloud-provider-gcp/cloud-provider-gcp-periodics.yaml b/config/jobs/kubernetes/cloud-provider-gcp/cloud-provider-gcp-periodics.yaml
@@ -62,7 +62,7 @@ periodics:
           export TEST_PACKAGE_VERSION="v1.25.0";
           echo "TEST_PACKAGE_VERSION - Falling back to v1.25.0";
         fi;
-        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --master-size n1-standard-2  -- --test-package-version="${TEST_PACKAGE_VERSION}" --focus-regex='\[Conformance\]'
+        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --master-size e2-standard-2  -- --test-package-version="${TEST_PACKAGE_VERSION}" --focus-regex='\[Conformance\]'
 - interval: 24h
   cluster: k8s-infra-prow-build
   name: ci-cloud-provider-gcp-e2e-latest
@@ -126,7 +126,7 @@ periodics:
           export TEST_PACKAGE_VERSION="v1.25.0";
           echo "TEST_PACKAGE_VERSION - Falling back to v1.25.0";
         fi;
-        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size n1-standard-4 --master-size n1-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
+        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size e2-standard-4 --master-size e2-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
 
 - interval: 6h
   cluster: k8s-infra-prow-build
@@ -197,7 +197,7 @@ periodics:
         fi;
         cd $GOPATH/src/k8s.io/cloud-provider-gcp;
         e2e/add-kubernetes-to-workspace.sh;
-        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size n1-standard-4 --master-size n1-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
+        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size e2-standard-4 --master-size e2-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
 - interval: 3h
   cluster: k8s-infra-prow-build
   name: ci-cloud-provider-gcp-conformance-latest-with-gcepd
@@ -261,7 +261,7 @@ periodics:
           export TEST_PACKAGE_VERSION="v1.25.0";
           echo "TEST_PACKAGE_VERSION - Falling back to v1.25.0";
         fi;
-        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --master-size n1-standard-2  -- --test-package-version="${TEST_PACKAGE_VERSION}" --focus-regex='\[Conformance\]' --test-args=--enabled-volume-drivers=gcepd
+        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --master-size e2-standard-2  -- --test-package-version="${TEST_PACKAGE_VERSION}" --focus-regex='\[Conformance\]' --test-args=--enabled-volume-drivers=gcepd
 - interval: 24h
   cluster: k8s-infra-prow-build
   name: ci-cloud-provider-gcp-e2e-latest-with-gcepd
@@ -325,7 +325,7 @@ periodics:
           export TEST_PACKAGE_VERSION="v1.25.0";
           echo "TEST_PACKAGE_VERSION - Falling back to v1.25.0";
         fi;
-        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size n1-standard-4 --master-size n1-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8 --enabled-volume-drivers=gcepd' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
+        kubetest2 gce -v 2 --repo-root $REPO_ROOT --build --up --down --test=ginkgo --node-size e2-standard-4 --master-size e2-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8 --enabled-volume-drivers=gcepd' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
 
 - interval: 6h
   cluster: k8s-infra-prow-build
diff --git a/config/jobs/kubernetes/cloud-provider-gcp/cloud-provider-gcp-presubmits.yaml b/config/jobs/kubernetes/cloud-provider-gcp/cloud-provider-gcp-presubmits.yaml
@@ -223,7 +223,7 @@ presubmits:
             export TEST_PACKAGE_VERSION="v1.25.0";
             echo "TEST_PACKAGE_VERSION - Falling back to v1.25.0";
           fi;
-          kubetest2 gce -v 2 --repo-root "${REPO_ROOT}" --build --up --down --test=ginkgo --node-size n1-standard-4 --master-size n1-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
+          kubetest2 gce -v 2 --repo-root "${REPO_ROOT}" --build --up --down --test=ginkgo --node-size e2-standard-4 --master-size e2-standard-8 -- --test-package-version="${TEST_PACKAGE_VERSION}" --parallel=30 --test-args='--minStartupPods=8' --skip-regex='\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]'
         resources:
           limits:
             cpu: 4
diff --git a/config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gcp-gpu-presubmits.yaml b/config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gcp-gpu-presubmits.yaml
@@ -7,7 +7,7 @@ presets:
   - name: CREATE_CUSTOM_NETWORK
     value: "true"
   - name: NODE_SIZE
-    value: n1-standard-2
+    value: e2-standard-2
 
 presubmits:
   kubernetes/kubernetes:
diff --git a/config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gpu-gce.yaml b/config/jobs/kubernetes/sig-cloud-provider/gcp/gpu/gpu-gce.yaml
@@ -5,14 +5,14 @@ presets:
   - name: NODE_ACCELERATORS
     value: type=nvidia-tesla-t4,count=2
   - name: NODE_SIZE
-    value: n1-standard-2
+    value: e2-standard-2
 - labels:
     preset-ci-gce-device-plugin-gpu-nvidia-t4: "true"
   env:
   - name: NODE_ACCELERATORS
     value: type=nvidia-tesla-t4,count=2
   - name: NODE_SIZE
-    value: n1-standard-2
+    value: e2-standard-2
 
 periodics:
 - name: ci-kubernetes-e2e-gce-device-plugin-gpu
diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-presets.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-presets.yaml
@@ -274,7 +274,7 @@ presets:
   env:
   # Override GCE defaults.
   - name: MASTER_SIZE
-    value: "n1-standard-4"
+    value: "e2-standard-4"
   - name: NODE_SIZE
     value: "e2-standard-8"
   - name: NODE_DISK_SIZE
diff --git a/experiment/create-build-project.sh b/experiment/create-build-project.sh
@@ -39,7 +39,7 @@ PROJECT_ID=
 INTERACTIVE=
 
 CLUSTER_NAME="prow"
-MACHINE_TYPE="n1-standard-1"
+MACHINE_TYPE="e2-standard-1"
 NUM_NODES="3"
 ZONE="us-west1-a"
 POD_NAMESPACE="test-pods"
diff --git a/jobs/e2e_node/containerd/containerd-main/cgroupv2/image-config-cgroupv2-serial.yaml b/jobs/e2e_node/containerd/containerd-main/cgroupv2/image-config-cgroupv2-serial.yaml
@@ -2,5 +2,5 @@ images:
   cos-stable:
     image_family: cos-beta
     project: cos-cloud
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2,gci-update-strategy=update_disabled"
diff --git a/jobs/e2e_node/containerd/containerd-main/perf-image-config.yaml b/jobs/e2e_node/containerd/containerd-main/perf-image-config.yaml
@@ -2,12 +2,12 @@ images:
   ubuntu:
     image_family: pipeline-1-29
     project: ubuntu-os-gke-cloud
-    machine: n1-standard-16  # node performance tests will be skipped on smaller machines
+    machine: e2-standard-16  # node performance tests will be skipped on smaller machines
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env"
   cos-stable:
     image_family: cos-beta
     project: cos-cloud
-    machine: n1-standard-16 # node performance tests will be skipped on smaller machines
+    machine: e2-standard-16 # node performance tests will be skipped on smaller machines
     metadata: "user-data</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/env,gci-update-strategy=update_disabled"
 
 # The only difference of this file from the image-config.yaml supposed to be the machine size
diff --git a/jobs/e2e_node/containerd/image-config-serial-eviction.yaml b/jobs/e2e_node/containerd/image-config-serial-eviction.yaml
@@ -2,5 +2,5 @@ images:
   cos-stable1:
     image_family: cos-beta
     project: cos-cloud
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init-eviction.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config-systemd.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"
diff --git a/jobs/e2e_node/containerd/image-config-serial-hugepages.yaml b/jobs/e2e_node/containerd/image-config-serial-hugepages.yaml
@@ -6,5 +6,5 @@ images:
     image_family: pipeline-1-29
     project: ubuntu-os-gke-cloud
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/ubuntu-init-hugepages-1G-allocation.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"
-    # Using `n1-standard-2` to have enough memory for 1Gb huge pages allocation
-    machine: n1-standard-2
+    # Using `e2-standard-2` to have enough memory for 1Gb huge pages allocation
+    machine: e2-standard-2
diff --git a/jobs/e2e_node/containerd/image-config-serial.yaml b/jobs/e2e_node/containerd/image-config-serial.yaml
@@ -5,12 +5,12 @@ images:
     # the image regex is added so that only cgroupv2 images are selected.
     # currently all images with cgroupv1 from gke have a -cgroupsv1 suffix
     image_regex: ".*[^-cgroupsv1]$"
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config-systemd.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"
   cos-stable2:
     image_family: cos-stable
     project: cos-cloud
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config-systemd.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"
     resources:
       accelerators:
@@ -19,5 +19,5 @@ images:
   cos-stable1:
     image_family: cos-stable
     project: cos-cloud
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config-systemd.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv1-hugepages.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv1-hugepages.yaml
@@ -6,5 +6,5 @@ images:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv1_hugepages.ign"
-    # Using `n1-standard-2` to have enough memory for 1Gb huge pages allocation
-    machine: n1-standard-2
+    # Using `e2-standard-2` to have enough memory for 1Gb huge pages allocation
+    machine: e2-standard-2
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv1-resource-managers.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv1-resource-managers.yaml
@@ -2,6 +2,6 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    # Using `n1-standard-4` to enable CPU manager node e2e tests.
-    machine: n1-standard-4
+    # Using `e2-standard-4` to enable CPU manager node e2e tests.
+    machine: e2-standard-4
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv1.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv1-serial.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv1-serial.yaml
@@ -2,5 +2,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-4
+    machine: e2-standard-4
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv1.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-hugepages.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-hugepages.yaml
@@ -6,5 +6,5 @@ images:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2_hugepages.ign"
-    # Using `n1-standard-2` to have enough memory for 1Gb huge pages allocation
-    machine: n1-standard-2
+    # Using `e2-standard-2` to have enough memory for 1Gb huge pages allocation
+    machine: e2-standard-2
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-imagefs.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-imagefs.yaml
@@ -2,5 +2,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-2
+    machine: e2-standard-2
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2_imagefs.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-performance.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-performance.yaml
@@ -2,5 +2,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-16
+    machine: e2-standard-16
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-resource-managers.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-resource-managers.yaml
@@ -2,6 +2,6 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    # Using `n1-standard-4` to enable CPU manager node e2e tests.
-    machine: n1-standard-4
+    # Using `e2-standard-4` to enable CPU manager node e2e tests.
+    machine: e2-standard-4
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-serial.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-serial.yaml
@@ -2,5 +2,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-4
+    machine: e2-standard-4
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2.ign"
diff --git a/jobs/e2e_node/crio/latest/image-config-cgroupv2-splitfs.yaml b/jobs/e2e_node/crio/latest/image-config-cgroupv2-splitfs.yaml
@@ -2,5 +2,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-2
+    machine: e2-standard-2
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2_splitfs.ign"
diff --git a/jobs/e2e_node/image-config-serial-cpu-manager.yaml b/jobs/e2e_node/image-config-serial-cpu-manager.yaml
@@ -5,11 +5,11 @@ images:
   ubuntu:
     image: ubuntu-gke-2204-1-24-v20220623
     project: ubuntu-os-gke-cloud
-    # Using `n1-standard-4` to enable CPU manager node e2e tests.
-    machine: n1-standard-4
+    # Using `e2-standard-4` to enable CPU manager node e2e tests.
+    machine: e2-standard-4
   cos-stable1:
     image_family: cos-beta
     project: cos-cloud
     metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"
-    # Using `n1-standard-4` to enable CPU manager node e2e tests.
-    machine: n1-standard-4
+    # Using `e2-standard-4` to enable CPU manager node e2e tests.
+    machine: e2-standard-4
diff --git a/jobs/e2e_node/image-config-serial-hugepages.yaml b/jobs/e2e_node/image-config-serial-hugepages.yaml
@@ -6,5 +6,5 @@ images:
     image: ubuntu-gke-2204-1-24-v20220623
     project: ubuntu-os-gke-cloud
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/ubuntu-hugepages-1G-allocation.yaml"
-    # Using `n1-standard-2` to have enough memory for 1Gb huge pages allocation
-    machine: n1-standard-2
+    # Using `e2-standard-2` to have enough memory for 1Gb huge pages allocation
+    machine: e2-standard-2
diff --git a/jobs/e2e_node/image-config-serial.yaml b/jobs/e2e_node/image-config-serial.yaml
@@ -4,10 +4,10 @@
 images:
   ubuntu:
     image: ubuntu-gke-2204-1-24-v20220623
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     project: ubuntu-os-gke-cloud
   cos-stable1:
     image_family: cos-beta
     project: cos-cloud
-    machine: n1-standard-2 # These tests need a lot of memory
+    machine: e2-standard-2 # These tests need a lot of memory
     metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"
diff --git a/jobs/e2e_node/swap/image-config-swap-fedora.yaml b/jobs/e2e_node/swap/image-config-swap-fedora.yaml
@@ -5,5 +5,5 @@ images:
   fedora:
     image_family: fedora-coreos-stable
     project: fedora-coreos-cloud
-    machine: n1-standard-2
+    machine: e2-standard-2
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2_swap1g.ign"
diff --git a/jobs/e2e_node/swap/image-config-swap.yaml b/jobs/e2e_node/swap/image-config-swap.yaml
@@ -9,4 +9,4 @@ images:
     # currently all images with cgroupv1 from gke have a -cgroupsv1 suffix
     image_regex: ".*[^-cgroupsv1]$"
     metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/swap/ubuntu-swap-1G-allocation.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config.toml"
-    machine: n1-standard-2
+    machine: e2-standard-2
diff --git a/kubetest/gke.go b/kubetest/gke.go
@@ -47,7 +47,7 @@ var (
 	gkeAdditionalZones             = flag.String("gke-additional-zones", "", "(gke only) List of additional Google Compute Engine zones to use. Clusters are created symmetrically across zones by default, see --gke-shape for details.")
 	gkeNodeLocations               = flag.String("gke-node-locations", "", "(gke only) List of Google Compute Engine zones to use.")
 	gkeEnvironment                 = flag.String("gke-environment", "", "(gke only) Container API endpoint to use, one of 'test', 'staging', 'prod', or a custom https:// URL")
-	gkeShape                       = flag.String("gke-shape", `{"default":{"Nodes":3,"MachineType":"n1-standard-2"}}`, `(gke only) A JSON description of node pools to create. The node pool 'default' is required and used for initial cluster creation. All node pools are symmetric across zones, so the cluster total node count is {total nodes in --gke-shape} * {1 + (length of --gke-additional-zones)}. Example: '{"default":{"Nodes":999,"MachineType:":"n1-standard-1"},"heapster":{"Nodes":1, "MachineType":"n1-standard-8", "ExtraArgs": []}}`)
+	gkeShape                       = flag.String("gke-shape", `{"default":{"Nodes":3,"MachineType":"e2-standard-2"}}`, `(gke only) A JSON description of node pools to create. The node pool 'default' is required and used for initial cluster creation. All node pools are symmetric across zones, so the cluster total node count is {total nodes in --gke-shape} * {1 + (length of --gke-additional-zones)}. Example: '{"default":{"Nodes":999,"MachineType:":"e2-standard-1"},"heapster":{"Nodes":1, "MachineType":"e2-standard-8", "ExtraArgs": []}}`)
 	gkeCreateArgs                  = flag.String("gke-create-args", "", "(gke only) (deprecated, use a modified --gke-create-command') Additional arguments passed directly to 'gcloud container clusters create'")
 	gkeCommandGroup                = flag.String("gke-command-group", "", "(gke only) Use a different gcloud track (e.g. 'alpha') for all 'gcloud container' commands. Note: This is added to --gke-create-command on create. You should only use --gke-command-group if you need to change the gcloud track for *every* gcloud container command.")
 	gkeGcloudCommand               = flag.String("gke-gcloud-command", "gcloud", "(gke only) gcloud command used to create a cluster. Modify if you need to pass custom gcloud to create cluster.")
diff --git a/kubetest/main.go b/kubetest/main.go
diff --git a/rbe/install.sh b/rbe/install.sh
