diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
index ad297e44ee64..b5b0c5782808 100644
--- a/config/jobs/kubernetes/kops/build_jobs.py
+++ b/config/jobs/kubernetes/kops/build_jobs.py
@@ -353,12 +353,9 @@ def presubmit_test(branch='master',
 
 distro_options = [
     'amzn2',
-    'deb9',
     'deb10',
     'flatcar',
-    'rhel7',
     'rhel8',
-    'u1804',
     'u2004',
 ]
 
@@ -391,9 +388,6 @@ def generate_grid():
             for distro in distro_options:
                 for k8s_version in k8s_versions:
                     for kops_version in kops_versions:
-                        # https://github.com/kubernetes/kops/pull/11696
-                        if kops_version is None and distro in ["deb9", "rhel7", "u1804"]:
-                            continue
                         results.append(
                             build_test(cloud="aws",
                                        distro=distro,
@@ -413,9 +407,6 @@ def generate_grid():
             for distro in ['u2004']: # TODO: all distro_options:
                 for k8s_version in ["1.22"]: # TODO: all k8s_versions:
                     for kops_version in [None]: # TODO: all kops_versions:
-                        # https://github.com/kubernetes/kops/pull/11696
-                        if kops_version is None and distro in ["deb9", "rhel7", "u1804"]:
-                            continue
                         results.append(
                             build_test(cloud="gce",
                                        distro=distro,
@@ -792,7 +783,7 @@ def generate_versions():
         )
     ]
     for version in ['1.22', '1.21', '1.20', '1.19', '1.18']:
-        distro = 'deb9' if version == '1.17' else 'u2004'
+        distro = 'u2004'
         results.append(
             build_test(
                 distro=distro,
diff --git a/config/jobs/kubernetes/kops/kops-periodics-grid.yaml b/config/jobs/kubernetes/kops/kops-periodics-grid.yaml
index bc0f99301859..5a8a3ecf7b82 100644
--- a/config/jobs/kubernetes/kops/kops-periodics-grid.yaml
+++ b/config/jobs/kubernetes/kops/kops-periodics-grid.yaml
@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 574 jobs, total of 1186 runs per week
+# 454 jobs, total of 1066 runs per week
 periodics:
 
 # {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
@@ -508,9 +508,9 @@ periodics:
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-grid-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k20-ko21-docker
-  cron: '38 19 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-docker
+  cron: '19 13 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -537,8 +537,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -562,18 +562,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k20-ko21-docker
+    testgrid-tab-name: kops-grid-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k20-ko22-docker
-  cron: '37 0 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-ko21-docker
+  cron: '31 0 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -600,8 +600,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -625,18 +625,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k20-ko22-docker
+    testgrid-tab-name: kops-grid-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k21-ko21-docker
-  cron: '59 22 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-ko22-docker
+  cron: '0 11 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -663,14 +663,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -688,18 +688,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k21-ko21-docker
+    testgrid-tab-name: kops-grid-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k21-ko22-docker
-  cron: '4 5 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-docker
+  cron: '21 19 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -726,8 +726,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -751,18 +751,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k21-ko22-docker
+    testgrid-tab-name: kops-grid-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k22-ko22-docker
-  cron: '10 19 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-ko21-docker
+  cron: '6 5 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -789,14 +789,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -814,19 +814,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k22-ko22-docker
+    testgrid-tab-name: kops-grid-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-docker
-  cron: '19 13 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-ko22-docker
+  cron: '57 6 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -854,13 +853,13 @@ periodics:
           --up --down \
           --cloud-provider=aws \
           --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -879,17 +878,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-docker
+    testgrid-tab-name: kops-grid-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-ko21-docker
-  cron: '31 0 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k22-docker
+  cron: '10 0 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -916,14 +915,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -942,17 +941,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-ko21-docker
+    testgrid-tab-name: kops-grid-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-ko22-docker
-  cron: '0 11 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k22-ko22-docker
+  cron: '47 0 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -979,14 +979,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1005,17 +1005,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-ko22-docker
+    testgrid-tab-name: kops-grid-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-docker
-  cron: '21 19 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-docker
+  cron: '15 9 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1042,20 +1043,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1067,18 +1069,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-docker
+    testgrid-tab-name: kops-grid-flatcar-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-ko21-docker
-  cron: '6 5 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-ko21-docker
+  cron: '51 15 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1105,20 +1107,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1130,18 +1133,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flatcar-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-ko22-docker
-  cron: '57 6 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-ko22-docker
+  cron: '40 4 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1168,20 +1171,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1193,18 +1197,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flatcar-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k22-docker
-  cron: '10 0 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-docker
+  cron: '53 7 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1231,20 +1235,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1256,19 +1261,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k22-docker
+    testgrid-tab-name: kops-grid-flatcar-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k22-ko22-docker
-  cron: '47 0 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-ko21-docker
+  cron: '38 10 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1295,20 +1299,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1320,21 +1325,20 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flatcar-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-docker
-  cron: '15 9 * * 5'
-  labels:
-    preset-service-account: "true"
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-ko22-docker
+  cron: '13 1 * * 2'
+  labels:
+    preset-service-account: "true"
     preset-aws-ssh: "true"
     preset-aws-credential: "true"
   decorate: true
@@ -1360,14 +1364,14 @@ periodics:
           --up --down \
           --cloud-provider=aws \
           --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1386,17 +1390,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-docker
+    testgrid-tab-name: kops-grid-flatcar-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-ko21-docker
-  cron: '51 15 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k22-docker
+  cron: '54 4 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1423,15 +1427,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1450,17 +1454,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flatcar-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-ko22-docker
-  cron: '40 4 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k22-ko22-docker
+  cron: '39 23 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1487,15 +1492,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1514,17 +1519,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flatcar-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-docker
-  cron: '53 7 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-docker
+  cron: '48 10 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1551,21 +1557,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1577,18 +1582,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-docker
+    testgrid-tab-name: kops-grid-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-ko21-docker
-  cron: '38 10 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-ko21-docker
+  cron: '6 1 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1615,21 +1620,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1641,18 +1645,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-ko21-docker
+    testgrid-tab-name: kops-grid-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-ko22-docker
-  cron: '13 1 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-ko22-docker
+  cron: '41 2 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1679,21 +1683,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1705,18 +1708,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-ko22-docker
+    testgrid-tab-name: kops-grid-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k22-docker
-  cron: '54 4 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-docker
+  cron: '50 12 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1743,21 +1746,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1769,19 +1771,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k22-docker
+    testgrid-tab-name: kops-grid-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k22-ko22-docker
-  cron: '39 23 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-ko21-docker
+  cron: '55 4 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1808,21 +1809,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -1834,19 +1834,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k22-ko22-docker
+    testgrid-tab-name: kops-grid-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k20-ko21-docker
-  cron: '43 20 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-ko22-docker
+  cron: '36 15 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1873,14 +1872,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1898,18 +1897,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k20-ko21-docker
+    testgrid-tab-name: kops-grid-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k20-ko22-docker
-  cron: '8 7 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k22-docker
+  cron: '17 7 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1936,14 +1935,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -1961,18 +1960,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k20-ko22-docker
+    testgrid-tab-name: kops-grid-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k21-ko21-docker
-  cron: '46 1 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k22-ko22-docker
+  cron: '6 17 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -1999,14 +1999,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -2024,18 +2024,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k21-ko21-docker
+    testgrid-tab-name: kops-grid-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k21-ko22-docker
-  cron: '53 10 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-docker
+  cron: '10 0 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2062,20 +2063,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2087,20 +2088,20 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k21-ko22-docker
+    testgrid-tab-name: kops-grid-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k22-ko22-docker
-  cron: '19 12 * * 5'
-  labels:
-    preset-service-account: "true"
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-ko21-docker
+  cron: '56 23 * * *'
+  labels:
+    preset-service-account: "true"
     preset-aws-ssh: "true"
     preset-aws-credential: "true"
   decorate: true
@@ -2125,20 +2126,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2150,19 +2151,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k22-ko22-docker
+    testgrid-tab-name: kops-grid-u2004-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-docker
-  cron: '48 10 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-ko22-docker
+  cron: '23 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2189,8 +2189,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -2202,7 +2202,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2214,18 +2214,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-docker
+    testgrid-tab-name: kops-grid-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-ko21-docker
-  cron: '6 1 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-docker
+  cron: '32 14 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2252,20 +2252,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2277,18 +2277,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-ko21-docker
+    testgrid-tab-name: kops-grid-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-ko22-docker
-  cron: '41 2 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-ko21-docker
+  cron: '5 2 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2315,20 +2315,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2340,18 +2340,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-ko22-docker
+    testgrid-tab-name: kops-grid-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-docker
-  cron: '50 12 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-ko22-docker
+  cron: '6 1 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2378,8 +2378,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -2391,7 +2391,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2403,18 +2403,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-docker
+    testgrid-tab-name: kops-grid-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-ko21-docker
-  cron: '55 4 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k22-docker
+  cron: '15 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2441,20 +2441,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2466,18 +2466,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-ko21-docker
+    testgrid-tab-name: kops-grid-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-ko22-docker
-  cron: '36 15 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k22-ko22-docker
+  cron: '0 7 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2504,20 +2505,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2529,18 +2530,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-ko22-docker
+    testgrid-tab-name: kops-grid-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k22-docker
-  cron: '17 7 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-docker
+  cron: '29 5 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2567,14 +2569,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -2592,19 +2594,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k22-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k22-ko22-docker
-  cron: '6 17 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-ko21-docker
+  cron: '18 21 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2631,14 +2632,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -2656,19 +2657,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k20-ko21-docker
-  cron: '47 16 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-ko22-docker
+  cron: '49 14 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2695,8 +2695,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -2708,7 +2708,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2720,18 +2720,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k20-ko22-docker
-  cron: '28 3 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-docker
+  cron: '15 19 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2758,20 +2758,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2783,18 +2783,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k21-ko21-docker
-  cron: '18 13 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-ko21-docker
+  cron: '43 16 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2821,7 +2821,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -2834,7 +2834,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2846,18 +2846,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k21-ko21-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k21-ko22-docker
-  cron: '21 14 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-ko22-docker
+  cron: '32 3 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2884,7 +2884,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -2897,7 +2897,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2909,18 +2909,82 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '90'
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko22-docker
+
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k22-docker
+  cron: '4 0 * * 5'
+  labels:
+    preset-service-account: "true"
+    preset-aws-ssh: "true"
+    preset-aws-credential: "true"
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=aws \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --test=kops \
+          -- \
+          --ginkgo-args="--debug" \
+          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-package-marker=stable-1.22.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/aws-ssh/aws-ssh-private
+      - name: KUBE_SSH_USER
+        value: ec2-user
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          memory: 3Gi
+        requests:
+          cpu: "2"
+          memory: 3Gi
+  annotations:
+    test.kops.k8s.io/cloud: aws
+    test.kops.k8s.io/container_runtime: docker
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k21-ko22-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k22-ko22-docker
-  cron: '23 8 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k22-ko22-docker
+  cron: '50 13 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -2947,7 +3011,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -2960,7 +3024,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -2972,19 +3036,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-docker
-  cron: '10 0 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-docker
+  cron: '57 21 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3011,7 +3075,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -3024,7 +3088,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3036,18 +3100,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-ko21-docker
-  cron: '56 23 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-ko21-docker
+  cron: '25 18 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3074,7 +3138,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -3087,7 +3151,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3099,18 +3163,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-ko22-docker
-  cron: '23 12 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-ko22-docker
+  cron: '50 17 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3137,7 +3201,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -3150,7 +3214,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3162,18 +3226,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-docker
-  cron: '32 14 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-docker
+  cron: '39 11 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3200,7 +3264,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -3213,7 +3277,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3225,18 +3289,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-ko21-docker
-  cron: '5 2 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-ko21-docker
+  cron: '24 23 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3263,7 +3327,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -3276,7 +3340,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3288,18 +3352,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-ko21-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-ko22-docker
-  cron: '6 1 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-ko22-docker
+  cron: '3 12 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3326,7 +3390,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -3339,7 +3403,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3351,18 +3415,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-ko22-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k22-docker
-  cron: '15 21 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k22-docker
+  cron: '24 8 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3389,7 +3453,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -3402,7 +3466,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3414,19 +3478,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k22-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k22-ko22-docker
-  cron: '0 7 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k22-ko22-docker
+  cron: '13 18 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3453,7 +3517,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -3466,7 +3530,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3478,19 +3542,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-docker
-  cron: '29 5 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-docker
+  cron: '29 15 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3517,9 +3581,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3530,7 +3595,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3542,19 +3607,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-ko21-docker
-  cron: '18 21 * * 4'
-  labels:
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-ko21-docker
+  cron: '49 21 * * 6'
+  labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
     preset-aws-credential: "true"
@@ -3580,9 +3645,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3593,7 +3659,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3605,18 +3671,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-ko22-docker
-  cron: '49 14 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-ko22-docker
+  cron: '50 6 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3643,9 +3709,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3656,7 +3723,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3668,18 +3735,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-docker
-  cron: '15 19 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-docker
+  cron: '39 1 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3706,9 +3773,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3719,7 +3787,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3731,18 +3799,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-ko21-docker
-  cron: '43 16 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-ko21-docker
+  cron: '48 8 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3769,9 +3837,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3782,7 +3851,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3794,18 +3863,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko21-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-ko22-docker
-  cron: '32 3 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-ko22-docker
+  cron: '23 3 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3832,9 +3901,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3845,7 +3915,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3857,18 +3927,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko22-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k22-docker
-  cron: '4 0 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k22-docker
+  cron: '16 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3895,9 +3965,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3908,7 +3979,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3920,19 +3991,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k22-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k22-ko22-docker
-  cron: '50 13 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k22-ko22-docker
+  cron: '57 21 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -3959,9 +4030,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -3972,7 +4044,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -3984,19 +4056,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-flatcar-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k20-ko21-docker
-  cron: '50 14 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-docker
+  cron: '18 2 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4023,8 +4095,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -4036,7 +4108,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4048,18 +4120,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k20-ko22-docker
-  cron: '9 5 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-ko21-docker
+  cron: '0 11 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4086,8 +4158,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -4099,7 +4171,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4111,18 +4183,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k21-ko21-docker
-  cron: '31 19 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-ko22-docker
+  cron: '39 8 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4149,20 +4221,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4174,18 +4246,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k21-ko21-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k21-ko22-docker
-  cron: '48 16 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-docker
+  cron: '36 12 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4212,8 +4284,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -4225,7 +4297,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4237,18 +4309,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k21-ko22-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k22-ko22-docker
-  cron: '42 22 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-ko21-docker
+  cron: '5 22 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4275,20 +4347,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4300,19 +4372,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-docker
-  cron: '57 21 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-ko22-docker
+  cron: '58 13 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4339,20 +4410,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4364,18 +4435,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-ko21-docker
-  cron: '25 18 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k22-docker
+  cron: '7 23 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4402,20 +4473,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4427,18 +4498,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-ko22-docker
-  cron: '50 17 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k22-ko22-docker
+  cron: '24 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4465,20 +4537,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4490,18 +4562,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-docker
-  cron: '39 11 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-docker
+  cron: '28 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4528,20 +4601,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4553,18 +4626,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-ko21-docker
-  cron: '24 23 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-ko21-docker
+  cron: '42 5 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4591,20 +4664,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4616,18 +4689,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-ko21-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-ko22-docker
-  cron: '3 12 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-ko22-docker
+  cron: '21 22 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4654,20 +4727,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4679,18 +4752,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-ko22-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k22-docker
-  cron: '24 8 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-docker
+  cron: '26 6 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4717,20 +4790,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4742,19 +4815,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k22-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k22-ko22-docker
-  cron: '13 18 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-ko21-docker
+  cron: '27 0 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4781,20 +4853,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4806,19 +4878,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k22-ko22-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-docker
-  cron: '29 15 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-ko22-docker
+  cron: '0 19 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4845,21 +4916,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4871,18 +4941,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-ko21-docker
-  cron: '49 21 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k22-docker
+  cron: '1 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4909,21 +4979,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4935,18 +5004,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko21-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-ko22-docker
-  cron: '50 6 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k22-ko22-docker
+  cron: '54 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -4973,21 +5043,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -4999,18 +5068,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko22-docker
+    testgrid-tab-name: kops-grid-calico-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-docker
-  cron: '39 1 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-docker
+  cron: '43 15 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5037,21 +5107,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5063,18 +5132,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-ko21-docker
-  cron: '48 8 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-ko21-docker
+  cron: '28 11 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5101,21 +5170,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5127,18 +5195,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-ko22-docker
-  cron: '23 3 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-ko22-docker
+  cron: '51 8 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5165,21 +5233,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5191,18 +5258,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k22-docker
-  cron: '16 18 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-docker
+  cron: '13 17 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5229,21 +5296,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5255,19 +5321,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k22-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k22-ko22-docker
-  cron: '57 21 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-ko21-docker
+  cron: '13 22 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5294,21 +5359,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5320,19 +5384,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k20-ko21-docker
-  cron: '5 22 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-ko22-docker
+  cron: '18 21 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5359,14 +5422,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -5384,18 +5447,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k20-ko22-docker
-  cron: '50 21 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k22-docker
+  cron: '26 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5422,14 +5485,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -5447,18 +5510,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k21-ko21-docker
-  cron: '32 11 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k22-ko22-docker
+  cron: '12 11 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5485,14 +5549,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -5510,18 +5574,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k21-ko22-docker
-  cron: '19 16 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-docker
+  cron: '23 15 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5548,20 +5613,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5573,18 +5638,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k22-ko22-docker
-  cron: '37 22 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-ko21-docker
+  cron: '7 12 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5611,20 +5676,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5636,19 +5701,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-docker
-  cron: '18 2 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-ko22-docker
+  cron: '40 7 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5675,8 +5739,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -5688,7 +5752,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5700,18 +5764,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-ko21-docker
-  cron: '0 11 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-docker
+  cron: '13 9 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5738,20 +5802,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5763,18 +5827,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-ko22-docker
-  cron: '39 8 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-ko21-docker
+  cron: '2 9 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5801,20 +5865,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5826,18 +5890,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-docker
-  cron: '36 12 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-ko22-docker
+  cron: '25 10 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5864,8 +5928,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -5877,7 +5941,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5889,18 +5953,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-ko21-docker
-  cron: '5 22 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k22-docker
+  cron: '14 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5927,20 +5991,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -5952,18 +6016,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-ko22-docker
-  cron: '58 13 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k22-ko22-docker
+  cron: '59 12 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -5990,20 +6055,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6015,18 +6080,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k22-docker
-  cron: '7 23 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-docker
+  cron: '48 0 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6053,14 +6119,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -6079,18 +6145,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k22-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k22-ko22-docker
-  cron: '24 3 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-ko21-docker
+  cron: '6 5 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6117,14 +6182,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -6143,18 +6208,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k20-ko21-docker
-  cron: '45 18 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-ko22-docker
+  cron: '29 14 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6181,8 +6245,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -6194,7 +6258,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6206,18 +6270,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k20-ko22-docker
-  cron: '10 1 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-docker
+  cron: '54 14 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6244,20 +6308,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6269,18 +6333,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k21-ko21-docker
-  cron: '40 15 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-ko21-docker
+  cron: '27 16 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6307,7 +6371,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -6320,7 +6384,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6332,18 +6396,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k21-ko22-docker
-  cron: '15 12 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-ko22-docker
+  cron: '28 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6370,7 +6434,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -6383,7 +6447,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6395,18 +6459,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k22-ko22-docker
-  cron: '9 2 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k22-docker
+  cron: '41 13 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6433,8 +6497,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
@@ -6446,7 +6510,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6458,19 +6522,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-docker
-  cron: '28 16 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k22-ko22-docker
+  cron: '46 21 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6497,20 +6561,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -6522,18 +6586,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-docker
+    testgrid-tab-name: kops-grid-cilium-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-ko21-docker
-  cron: '42 5 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-docker
+  cron: '2 10 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6560,8 +6625,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -6588,15 +6653,15 @@ periodics:
     test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-ko22-docker
-  cron: '21 22 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-ko21-docker
+  cron: '44 11 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6623,7 +6688,70 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --test=kops \
+          -- \
+          --ginkgo-args="--debug" \
+          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-package-marker=stable-1.20.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/aws-ssh/aws-ssh-private
+      - name: KUBE_SSH_USER
+        value: ubuntu
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          memory: 3Gi
+        requests:
+          cpu: "2"
+          memory: 3Gi
+  annotations:
+    test.kops.k8s.io/cloud: aws
+    test.kops.k8s.io/container_runtime: docker
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '90'
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko21-docker
+
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-ko22-docker
+  cron: '39 16 * * *'
+  labels:
+    preset-service-account: "true"
+    preset-aws-ssh: "true"
+    preset-aws-credential: "true"
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=aws \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -6652,14 +6780,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-docker
-  cron: '26 6 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-docker
+  cron: '8 4 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6686,7 +6814,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -6715,14 +6843,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-ko21-docker
-  cron: '27 0 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-ko21-docker
+  cron: '57 22 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6749,7 +6877,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -6778,14 +6906,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-ko22-docker
-  cron: '0 19 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-ko22-docker
+  cron: '22 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6812,7 +6940,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -6841,14 +6969,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k22-docker
-  cron: '1 21 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k22-docker
+  cron: '35 15 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6875,7 +7003,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -6905,14 +7033,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k22-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k22-ko22-docker
-  cron: '54 21 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k22-ko22-docker
+  cron: '24 3 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -6939,7 +7067,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -6969,14 +7097,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-docker
-  cron: '43 15 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-docker
+  cron: '9 18 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7003,7 +7131,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7032,14 +7160,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-ko21-docker
-  cron: '28 11 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko21-docker
+  cron: '36 2 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7066,7 +7194,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7095,14 +7223,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-ko22-docker
-  cron: '51 8 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko22-docker
+  cron: '47 1 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7129,7 +7257,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7158,14 +7286,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-docker
-  cron: '13 17 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-docker
+  cron: '27 20 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7192,7 +7320,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7221,14 +7349,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-ko21-docker
-  cron: '13 22 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko21-docker
+  cron: '9 7 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7255,7 +7383,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7284,14 +7412,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-ko22-docker
-  cron: '18 21 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko22-docker
+  cron: '22 12 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7318,7 +7446,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7347,14 +7475,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k22-docker
-  cron: '26 18 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k22-docker
+  cron: '36 15 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7381,7 +7509,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -7411,14 +7539,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k22-ko22-docker
-  cron: '12 11 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k22-ko22-docker
+  cron: '28 18 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7445,7 +7573,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -7475,14 +7603,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-docker
-  cron: '23 15 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-docker
+  cron: '57 18 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7509,7 +7637,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7538,14 +7666,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-ko21-docker
-  cron: '7 12 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko21-docker
+  cron: '55 13 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7572,7 +7700,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7601,15 +7729,15 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-ko22-docker
-  cron: '40 7 * * 0'
-  labels:
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko22-docker
+  cron: '52 22 * * 2'
+  labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
     preset-aws-credential: "true"
@@ -7635,7 +7763,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -7664,14 +7792,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-docker
-  cron: '13 9 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-docker
+  cron: '19 4 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7698,7 +7826,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7727,14 +7855,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-ko21-docker
-  cron: '2 9 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko21-docker
+  cron: '54 0 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7761,7 +7889,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7790,14 +7918,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-ko22-docker
-  cron: '25 10 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko22-docker
+  cron: '21 19 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7824,7 +7952,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -7853,14 +7981,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k22-docker
-  cron: '14 18 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k22-docker
+  cron: '16 15 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7887,7 +8015,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -7917,14 +8045,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k22-ko22-docker
-  cron: '59 12 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k22-ko22-docker
+  cron: '47 5 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -7951,7 +8079,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -7981,14 +8109,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-docker
-  cron: '48 0 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-docker
+  cron: '14 13 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8015,7 +8143,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8044,14 +8172,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-ko21-docker
-  cron: '6 5 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko21-docker
+  cron: '2 12 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8078,7 +8206,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8107,14 +8235,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-ko22-docker
-  cron: '29 14 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko22-docker
+  cron: '21 15 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8141,7 +8269,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8170,14 +8298,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-docker
-  cron: '54 14 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-docker
+  cron: '52 3 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8204,7 +8332,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8233,14 +8361,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-ko21-docker
-  cron: '27 16 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko21-docker
+  cron: '23 9 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8267,7 +8395,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8296,14 +8424,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-ko22-docker
-  cron: '28 3 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko22-docker
+  cron: '16 2 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8330,7 +8458,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8359,14 +8487,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k22-docker
-  cron: '41 13 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k22-docker
+  cron: '39 16 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8393,7 +8521,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -8423,14 +8551,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k22-ko22-docker
-  cron: '46 21 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k22-ko22-docker
+  cron: '34 4 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8457,7 +8585,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -8487,14 +8615,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-docker
-  cron: '2 10 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-docker
+  cron: '40 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8521,7 +8649,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8550,14 +8678,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-ko21-docker
-  cron: '44 11 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko21-docker
+  cron: '8 18 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8584,7 +8712,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8613,14 +8741,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-ko22-docker
-  cron: '39 16 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko22-docker
+  cron: '19 9 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8647,7 +8775,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -8676,14 +8804,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-docker
-  cron: '8 4 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-docker
+  cron: '18 17 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8710,7 +8838,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8739,14 +8867,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-ko21-docker
-  cron: '57 22 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko21-docker
+  cron: '29 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8773,7 +8901,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8802,14 +8930,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko21-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-ko22-docker
-  cron: '22 21 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko22-docker
+  cron: '50 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8836,7 +8964,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -8865,14 +8993,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k22-docker
-  cron: '35 15 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k22-docker
+  cron: '17 10 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8899,7 +9027,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -8929,14 +9057,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k22-ko22-docker
-  cron: '24 3 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k22-ko22-docker
+  cron: '28 18 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -8963,7 +9091,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -8993,14 +9121,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k22-ko22-docker
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-docker
-  cron: '9 18 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-docker
+  cron: '16 11 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9027,7 +9155,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9056,14 +9184,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko21-docker
-  cron: '36 2 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-ko21-docker
+  cron: '6 13 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9090,7 +9218,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9119,14 +9247,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko22-docker
-  cron: '47 1 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-ko22-docker
+  cron: '33 6 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9153,7 +9281,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9182,14 +9310,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-docker
-  cron: '27 20 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-docker
+  cron: '6 5 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9216,7 +9344,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9245,14 +9373,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko21-docker
-  cron: '9 7 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-ko21-docker
+  cron: '35 0 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9279,7 +9407,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9308,14 +9436,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko22-docker
-  cron: '22 12 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-ko22-docker
+  cron: '12 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9342,7 +9470,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9371,14 +9499,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k22-docker
-  cron: '36 15 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k22-docker
+  cron: '5 14 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9405,7 +9533,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -9435,14 +9563,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k22-ko22-docker
-  cron: '28 18 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k22-ko22-docker
+  cron: '46 21 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9469,7 +9597,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -9499,14 +9627,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-docker
-  cron: '57 18 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-docker
+  cron: '52 3 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9533,7 +9661,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9562,14 +9690,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko21-docker
-  cron: '55 13 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-ko21-docker
+  cron: '9 2 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9596,7 +9724,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9625,14 +9753,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko22-docker
-  cron: '52 22 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-ko22-docker
+  cron: '2 9 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9659,7 +9787,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -9688,14 +9816,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-docker
-  cron: '19 4 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-docker
+  cron: '42 5 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9722,7 +9850,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9751,14 +9879,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko21-docker
-  cron: '54 0 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-ko21-docker
+  cron: '4 15 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9785,7 +9913,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9814,14 +9942,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko22-docker
-  cron: '21 19 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-ko22-docker
+  cron: '15 20 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9848,7 +9976,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -9877,14 +10005,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k22-docker
-  cron: '16 15 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k22-docker
+  cron: '41 14 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9911,7 +10039,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -9941,14 +10069,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k22-ko22-docker
-  cron: '47 5 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k22-ko22-docker
+  cron: '41 18 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -9975,7 +10103,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -10005,14 +10133,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: flannel
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-docker
-  cron: '14 13 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-docker
+  cron: '39 22 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10039,9 +10167,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10052,7 +10181,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10064,18 +10193,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko21-docker
-  cron: '2 12 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-ko21-docker
+  cron: '50 18 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10102,9 +10231,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10115,7 +10245,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10127,18 +10257,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko22-docker
-  cron: '21 15 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-ko22-docker
+  cron: '33 17 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10165,9 +10295,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10178,7 +10309,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10190,18 +10321,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-docker
-  cron: '52 3 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-docker
+  cron: '1 0 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10228,9 +10359,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10241,7 +10373,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10253,18 +10385,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko21-docker
-  cron: '23 9 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-ko21-docker
+  cron: '39 7 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10291,9 +10423,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10304,7 +10437,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10316,18 +10449,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko22-docker
-  cron: '16 2 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-ko22-docker
+  cron: '36 20 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10354,9 +10487,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10367,7 +10501,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10379,18 +10513,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k22-docker
-  cron: '39 16 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k22-docker
+  cron: '42 19 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10417,9 +10551,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10430,7 +10565,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10442,19 +10577,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k22-ko22-docker
-  cron: '34 4 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k22-ko22-docker
+  cron: '2 2 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10481,9 +10616,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -10494,7 +10630,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10506,19 +10642,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-flatcar-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-docker
-  cron: '40 23 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-docker
+  cron: '59 4 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10545,7 +10681,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -10558,7 +10694,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10570,18 +10706,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko21-docker
-  cron: '8 18 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-ko21-docker
+  cron: '44 19 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10608,7 +10744,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -10621,7 +10757,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10633,18 +10769,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko22-docker
-  cron: '19 9 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-ko22-docker
+  cron: '47 0 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10671,7 +10807,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -10684,7 +10820,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10696,18 +10832,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-docker
-  cron: '18 17 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-docker
+  cron: '5 2 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10734,7 +10870,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -10747,7 +10883,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10759,18 +10895,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko21-docker
-  cron: '29 23 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-ko21-docker
+  cron: '53 14 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10797,7 +10933,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -10810,7 +10946,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10822,18 +10958,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko22-docker
-  cron: '50 12 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-ko22-docker
+  cron: '6 5 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10860,7 +10996,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -10873,7 +11009,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10885,18 +11021,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k22-docker
-  cron: '17 10 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k22-docker
+  cron: '54 17 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10923,7 +11059,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -10936,7 +11072,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -10948,19 +11084,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k22-ko22-docker
-  cron: '28 18 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k22-ko22-docker
+  cron: '8 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -10987,7 +11123,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -11000,7 +11136,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11012,19 +11148,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-docker
-  cron: '16 11 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-docker
+  cron: '1 14 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11051,7 +11187,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -11064,7 +11200,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11076,18 +11212,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-ko21-docker
-  cron: '6 13 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-ko21-docker
+  cron: '14 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11114,7 +11250,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -11127,7 +11263,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11139,18 +11275,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-ko22-docker
-  cron: '33 6 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-ko22-docker
+  cron: '13 14 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11177,7 +11313,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -11190,7 +11326,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11202,18 +11338,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-docker
-  cron: '6 5 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-docker
+  cron: '43 0 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11240,7 +11376,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -11253,7 +11389,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11265,18 +11401,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-ko21-docker
-  cron: '35 0 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-ko21-docker
+  cron: '11 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11303,7 +11439,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -11316,7 +11452,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11328,18 +11464,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko21-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-ko22-docker
-  cron: '12 3 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-ko22-docker
+  cron: '40 11 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11366,7 +11502,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -11379,7 +11515,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11391,18 +11527,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k22-docker
-  cron: '5 14 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k22-docker
+  cron: '24 11 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11429,7 +11565,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -11442,7 +11578,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11454,19 +11590,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k22-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k22-ko22-docker
-  cron: '46 21 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k22-ko22-docker
+  cron: '6 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11493,7 +11629,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -11506,7 +11642,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11518,19 +11654,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k22-ko22-docker
+    testgrid-tab-name: kops-grid-flannel-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k20-ko21-docker
-  cron: '22 21 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-docker
+  cron: '41 21 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11557,8 +11693,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -11570,7 +11706,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11582,18 +11718,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k20-ko22-docker
-  cron: '21 22 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-ko21-docker
+  cron: '12 23 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11620,8 +11756,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -11633,7 +11769,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11645,18 +11781,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k21-ko21-docker
-  cron: '19 0 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-ko22-docker
+  cron: '23 4 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11683,20 +11819,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11708,18 +11844,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k21-ko22-docker
-  cron: '40 3 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-docker
+  cron: '39 19 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11746,8 +11882,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -11759,7 +11895,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11771,18 +11907,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k22-ko22-docker
-  cron: '46 5 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-ko21-docker
+  cron: '5 10 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11809,20 +11945,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11834,19 +11970,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-docker
-  cron: '52 3 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-ko22-docker
+  cron: '58 17 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11873,20 +12008,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11898,18 +12033,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-ko21-docker
-  cron: '9 2 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k22-docker
+  cron: '52 16 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11936,20 +12071,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -11961,18 +12096,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-ko22-docker
-  cron: '2 9 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k22-ko22-docker
+  cron: '0 15 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -11999,20 +12135,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12024,18 +12160,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-docker
-  cron: '42 5 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-docker
+  cron: '57 5 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12062,14 +12199,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12088,17 +12225,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-ko21-docker
-  cron: '4 15 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-ko21-docker
+  cron: '15 8 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12125,14 +12262,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12151,17 +12288,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-ko22-docker
-  cron: '15 20 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-ko22-docker
+  cron: '44 11 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12188,14 +12325,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12214,17 +12351,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k22-docker
-  cron: '41 14 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-docker
+  cron: '23 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12251,14 +12388,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12277,18 +12414,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k22-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k22-ko22-docker
-  cron: '41 18 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-ko21-docker
+  cron: '34 21 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12315,14 +12451,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12341,18 +12477,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-docker
-  cron: '39 22 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-ko22-docker
+  cron: '53 6 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12379,21 +12514,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12405,18 +12539,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-ko21-docker
-  cron: '50 18 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k22-docker
+  cron: '4 0 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12443,21 +12577,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12469,18 +12602,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-ko22-docker
-  cron: '33 17 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k22-ko22-docker
+  cron: '47 16 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12507,21 +12641,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12533,18 +12666,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-deb10-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-docker
-  cron: '1 0 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-docker
+  cron: '38 4 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12571,15 +12705,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12598,17 +12732,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-ko21-docker
-  cron: '39 7 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-ko21-docker
+  cron: '51 7 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12635,15 +12769,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12662,17 +12796,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-ko22-docker
-  cron: '36 20 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-ko22-docker
+  cron: '4 4 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12699,15 +12833,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12726,17 +12860,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k22-docker
-  cron: '42 19 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-docker
+  cron: '48 10 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12763,15 +12897,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12790,18 +12924,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k22-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k22-ko22-docker
-  cron: '2 2 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-ko21-docker
+  cron: '58 2 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12828,15 +12961,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -12855,18 +12988,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k20-ko21-docker
-  cron: '21 22 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-ko22-docker
+  cron: '21 1 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12893,20 +13025,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12918,18 +13051,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k20-ko22-docker
-  cron: '18 21 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k22-docker
+  cron: '39 9 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -12956,20 +13089,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -12981,18 +13115,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k21-ko21-docker
-  cron: '44 11 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k22-ko22-docker
+  cron: '7 7 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13019,20 +13154,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -13044,18 +13180,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k21-ko22-docker
-  cron: '19 16 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-docker
+  cron: '26 2 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13082,14 +13219,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13107,18 +13244,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k22-ko22-docker
-  cron: '21 14 * * 1'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-ko21-docker
+  cron: '34 1 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13145,14 +13282,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13170,19 +13307,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-docker
-  cron: '59 4 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-ko22-docker
+  cron: '13 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13209,8 +13345,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -13237,15 +13373,15 @@ periodics:
     test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-ko21-docker
-  cron: '44 19 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-docker
+  cron: '52 4 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13272,14 +13408,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13298,17 +13434,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-ko22-docker
-  cron: '47 0 * * 6'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-ko21-docker
+  cron: '51 20 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13335,14 +13471,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13361,17 +13497,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-docker
-  cron: '5 2 * * 3'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-ko22-docker
+  cron: '4 7 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13398,8 +13534,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -13426,15 +13562,15 @@ periodics:
     test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-ko21-docker
-  cron: '53 14 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k22-docker
+  cron: '59 7 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13461,14 +13597,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13487,17 +13623,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-ko22-docker
-  cron: '6 5 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k22-ko22-docker
+  cron: '30 9 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13524,14 +13661,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13550,17 +13687,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k22-docker
-  cron: '54 17 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k20-docker
+  cron: '44 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13587,20 +13725,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -13612,19 +13750,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k22-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k20-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k22-ko22-docker
-  cron: '8 3 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k20-ko21-docker
+  cron: '0 15 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13651,20 +13788,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -13676,19 +13813,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k20-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k20-ko21-docker
-  cron: '41 2 * * 2'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k20-ko22-docker
+  cron: '43 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13715,8 +13851,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -13740,18 +13876,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k20-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k20-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k20-ko22-docker
-  cron: '22 9 * * 0'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k21-docker
+  cron: '50 22 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13778,14 +13914,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -13803,18 +13939,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k20-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k21-ko21-docker
-  cron: '24 23 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k21-ko21-docker
+  cron: '17 10 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13841,7 +13977,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -13866,18 +14002,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k21-ko21-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k21-ko21-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k21-ko22-docker
-  cron: '27 4 * * 5'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k21-ko22-docker
+  cron: '30 1 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13904,7 +14040,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -13929,18 +14065,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k21-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k21-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k22-ko22-docker
-  cron: '45 2 * * 4'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k22-docker
+  cron: '29 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -13967,8 +14103,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
@@ -13992,19 +14128,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k22-ko22-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-docker
-  cron: '1 14 * * *'
+# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-u2004-k22-ko22-docker
+  cron: '24 7 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14031,14 +14167,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -14057,17 +14193,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: docker
     test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kopeio
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-docker
+    testgrid-tab-name: kops-grid-kopeio-u2004-k22-ko22-docker
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-ko21-docker
-  cron: '14 21 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k20-containerd
+  cron: '39 14 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14094,8 +14231,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -14107,7 +14244,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14118,19 +14255,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko21-docker
+    testgrid-tab-name: kops-grid-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-ko22-docker
-  cron: '13 14 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k20-ko21-containerd
+  cron: '43 5 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14157,8 +14294,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -14170,7 +14307,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14181,19 +14318,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko22-docker
+    testgrid-tab-name: kops-grid-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-docker
-  cron: '43 0 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k20-ko22-containerd
+  cron: '55 13 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14220,20 +14357,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14244,19 +14381,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-docker
+    testgrid-tab-name: kops-grid-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-ko21-docker
-  cron: '11 16 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k21-containerd
+  cron: '36 1 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14283,8 +14420,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -14296,7 +14433,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14307,19 +14444,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko21-docker
+    testgrid-tab-name: kops-grid-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-ko22-docker
-  cron: '40 11 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k21-ko21-containerd
+  cron: '44 14 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14346,8 +14483,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -14359,7 +14496,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14370,19 +14507,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko22-docker
+    testgrid-tab-name: kops-grid-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k22-docker
-  cron: '24 11 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k21-ko22-containerd
+  cron: '24 22 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14409,20 +14546,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14433,20 +14570,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k22-docker
+    testgrid-tab-name: kops-grid-amzn2-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k22-ko22-docker
-  cron: '6 21 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k22-containerd
+  cron: '8 1 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14473,8 +14609,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
@@ -14486,7 +14622,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14497,20 +14633,20 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k22-ko22-docker
+    testgrid-tab-name: kops-grid-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-docker
-  cron: '41 21 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-amzn2-k22-ko22-containerd
+  cron: '20 2 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14537,14 +14673,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -14561,19 +14697,20 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
+    test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-docker
+    testgrid-tab-name: kops-grid-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-ko21-docker
-  cron: '12 23 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-containerd
+  cron: '34 15 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14600,8 +14737,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -14613,7 +14750,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14624,19 +14761,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko21-docker
+    testgrid-tab-name: kops-grid-deb10-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-ko22-docker
-  cron: '23 4 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-ko21-containerd
+  cron: '21 7 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14663,8 +14800,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -14676,7 +14813,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14687,19 +14824,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko22-docker
+    testgrid-tab-name: kops-grid-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-docker
-  cron: '39 19 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k20-ko22-containerd
+  cron: '17 23 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14726,20 +14863,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14750,19 +14887,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-docker
+    testgrid-tab-name: kops-grid-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-ko21-docker
-  cron: '5 10 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-containerd
+  cron: '25 8 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14789,8 +14926,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -14802,7 +14939,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -14813,19 +14950,19 @@ periodics:
           memory: 3Gi
   annotations:
     test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko21-docker
+    testgrid-tab-name: kops-grid-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-ko22-docker
-  cron: '58 17 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-ko21-containerd
+  cron: '30 12 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -14852,8 +14989,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -14865,7738 +15002,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k22-docker
-  cron: '52 16 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k22-ko22-docker
-  cron: '0 15 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k20-ko21-docker
-  cron: '29 13 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k20-ko22-docker
-  cron: '54 14 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k21-ko21-docker
-  cron: '24 0 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k21-ko22-docker
-  cron: '51 11 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k22-ko22-docker
-  cron: '57 21 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-docker
-  cron: '57 5 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-ko21-docker
-  cron: '15 8 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-ko22-docker
-  cron: '44 11 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-docker
-  cron: '23 3 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-ko21-docker
-  cron: '34 21 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-ko22-docker
-  cron: '53 6 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k22-docker
-  cron: '4 0 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k22-ko22-docker
-  cron: '47 16 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-docker
-  cron: '38 4 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-ko21-docker
-  cron: '51 7 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-ko22-docker
-  cron: '4 4 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-docker
-  cron: '48 10 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-ko21-docker
-  cron: '58 2 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-ko22-docker
-  cron: '21 1 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k22-docker
-  cron: '39 9 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k22-ko22-docker
-  cron: '7 7 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k20-ko21-docker
-  cron: '31 4 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k20-ko22-docker
-  cron: '8 23 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k21-ko21-docker
-  cron: '18 1 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k21-ko22-docker
-  cron: '33 18 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k22-ko22-docker
-  cron: '35 4 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-docker
-  cron: '26 2 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-ko21-docker
-  cron: '34 1 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-ko22-docker
-  cron: '13 18 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-docker
-  cron: '52 4 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-ko21-docker
-  cron: '51 20 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-ko22-docker
-  cron: '4 7 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k22-docker
-  cron: '59 7 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k22-ko22-docker
-  cron: '30 9 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k20-ko21-docker
-  cron: '31 8 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k20-ko22-docker
-  cron: '12 3 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k21-ko21-docker
-  cron: '58 5 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k21-ko22-docker
-  cron: '25 6 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k22-ko22-docker
-  cron: '7 16 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k20-docker
-  cron: '44 16 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k20-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k20-ko21-docker
-  cron: '0 15 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k20-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k20-ko22-docker
-  cron: '43 12 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k20-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k21-docker
-  cron: '50 22 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k21-ko21-docker
-  cron: '17 10 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k21-ko21-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k21-ko22-docker
-  cron: '30 1 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k21-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k22-docker
-  cron: '29 21 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k22-docker
-
-# {"cloud": "aws", "container_runtime": "docker", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u2004-k22-ko22-docker
-  cron: '24 7 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=docker --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: docker
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u2004-k22-ko22-docker
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k20-containerd
-  cron: '39 14 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k20-ko21-containerd
-  cron: '43 5 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k20-ko22-containerd
-  cron: '55 13 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k21-containerd
-  cron: '36 1 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k21-ko21-containerd
-  cron: '44 14 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k21-ko22-containerd
-  cron: '24 22 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k22-containerd
-  cron: '8 1 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-amzn2-k22-ko22-containerd
-  cron: '20 2 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-amzn2-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k20-ko21-containerd
-  cron: '41 2 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k20-ko22-containerd
-  cron: '53 18 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k21-ko21-containerd
-  cron: '42 9 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k21-ko22-containerd
-  cron: '46 1 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb9-k22-ko22-containerd
-  cron: '26 21 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb9-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-containerd
-  cron: '34 15 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-ko21-containerd
-  cron: '21 7 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k20-ko22-containerd
-  cron: '17 23 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-containerd
-  cron: '25 8 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-ko21-containerd
-  cron: '30 12 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k21-ko22-containerd
-  cron: '14 20 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k22-containerd
-  cron: '33 8 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-deb10-k22-ko22-containerd
-  cron: '10 0 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-deb10-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-containerd
-  cron: '2 21 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-ko21-containerd
-  cron: '46 18 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k20-ko22-containerd
-  cron: '58 2 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-containerd
-  cron: '29 10 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-ko21-containerd
-  cron: '5 17 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k21-ko22-containerd
-  cron: '13 1 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k22-containerd
-  cron: '13 18 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-flatcar-k22-ko22-containerd
-  cron: '21 21 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flatcar-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k20-ko21-containerd
-  cron: '31 17 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k20-ko22-containerd
-  cron: '59 9 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k21-ko21-containerd
-  cron: '36 18 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k21-ko22-containerd
-  cron: '48 2 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel7-k22-ko22-containerd
-  cron: '56 22 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel7-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-containerd
-  cron: '13 0 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-ko21-containerd
-  cron: '33 23 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k20-ko22-containerd
-  cron: '37 7 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-containerd
-  cron: '30 7 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-ko21-containerd
-  cron: '50 12 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k21-ko22-containerd
-  cron: '58 4 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k22-containerd
-  cron: '2 7 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-rhel8-k22-ko22-containerd
-  cron: '10 16 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-rhel8-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k20-ko21-containerd
-  cron: '50 0 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k20-ko22-containerd
-  cron: '34 8 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k21-ko21-containerd
-  cron: '1 3 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k21-ko22-containerd
-  cron: '21 19 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u1804-k22-ko22-containerd
-  cron: '5 23 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u1804-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-containerd
-  cron: '55 18 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-ko21-containerd
-  cron: '44 14 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k20-ko22-containerd
-  cron: '16 22 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-containerd
-  cron: '40 13 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-ko21-containerd
-  cron: '11 21 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k21-ko22-containerd
-  cron: '31 5 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k22-containerd
-  cron: '4 5 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
-- name: e2e-kops-grid-u2004-k22-ko22-containerd
-  cron: '47 1 * * *'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ubuntu
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kubenet
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-u2004-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-containerd
-  cron: '51 3 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-ko21-containerd
-  cron: '14 8 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k20-ko22-containerd
-  cron: '30 16 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-containerd
-  cron: '16 4 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-ko21-containerd
-  cron: '21 19 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k21-ko22-containerd
-  cron: '17 11 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k22-containerd
-  cron: '44 4 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-amzn2-k22-ko22-containerd
-  cron: '45 23 * * 6'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: ec2-user
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-amzn2-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k20-ko21-containerd
-  cron: '47 23 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k20-ko22-containerd
-  cron: '23 7 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k21-ko21-containerd
-  cron: '32 20 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k21-ko22-containerd
-  cron: '0 4 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb9-k22-ko22-containerd
-  cron: '36 0 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb9-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-containerd
-  cron: '6 10 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-ko21-containerd
-  cron: '48 10 * * 0'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k20-ko22-containerd
-  cron: '56 18 * * 4'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k20-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-containerd
-  cron: '9 21 * * 3'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-ko21-containerd
-  cron: '3 9 * * 2'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: admin
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -22612,14 +15018,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k21-ko22-containerd
-  cron: '11 17 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k21-ko22-containerd
+  cron: '14 20 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22646,7 +15052,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -22675,14 +15081,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k22-containerd
-  cron: '17 13 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k22-containerd
+  cron: '33 8 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22709,7 +15115,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -22739,14 +15145,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k22-containerd
+    testgrid-tab-name: kops-grid-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-deb10-k22-ko22-containerd
-  cron: '11 5 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-deb10-k22-ko22-containerd
+  cron: '10 0 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22773,7 +15179,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -22803,14 +15209,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-deb10-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-containerd
-  cron: '21 2 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-containerd
+  cron: '2 21 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22837,7 +15243,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
@@ -22867,14 +15273,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-containerd
+    testgrid-tab-name: kops-grid-flatcar-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-ko21-containerd
-  cron: '17 8 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-ko21-containerd
+  cron: '46 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22901,7 +15307,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
@@ -22931,14 +15337,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flatcar-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k20-ko22-containerd
-  cron: '5 0 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k20-ko22-containerd
+  cron: '58 2 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -22965,7 +15371,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --validation-wait=20m \
@@ -22995,14 +15401,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flatcar-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-containerd
-  cron: '22 5 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-containerd
+  cron: '29 10 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23029,7 +15435,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
@@ -23059,142 +15465,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
+    test.kops.k8s.io/networking: kubenet
     testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-ko21-containerd
-  cron: '22 11 * * 5'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko21-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k21-ko22-containerd
-  cron: '26 11 * * 1'
-  labels:
-    preset-service-account: "true"
-    preset-aws-ssh: "true"
-    preset-aws-credential: "true"
-  decorate: true
-  decoration_config:
-    timeout: 90m
-  extra_refs:
-  - org: kubernetes
-    repo: kops
-    base_ref: master
-    workdir: true
-    path_alias: k8s.io/kops
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        make test-e2e-install
-        kubetest2 kops \
-          -v 2 \
-          --up --down \
-          --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
-          --test=kops \
-          -- \
-          --ginkgo-args="--debug" \
-          --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
-          --parallel=25
-      env:
-      - name: KUBE_SSH_KEY_PATH
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: KUBE_SSH_USER
-        value: core
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
-      imagePullPolicy: Always
-      resources:
-        limits:
-          memory: 3Gi
-        requests:
-          cpu: "2"
-          memory: 3Gi
-  annotations:
-    test.kops.k8s.io/cloud: aws
-    test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
-    testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flatcar-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k22-containerd
-  cron: '14 13 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-ko21-containerd
+  cron: '5 17 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23221,15 +15499,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23248,18 +15526,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k22-containerd
+    testgrid-tab-name: kops-grid-flatcar-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-flatcar-k22-ko22-containerd
-  cron: '30 23 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k21-ko22-containerd
+  cron: '13 1 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23286,15 +15563,15 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23313,18 +15590,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-flatcar-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flatcar-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k20-ko21-containerd
-  cron: '10 12 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k22-containerd
+  cron: '13 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23351,20 +15627,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -23376,18 +15653,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flatcar-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k20-ko22-containerd
-  cron: '2 12 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-flatcar-k22-ko22-containerd
+  cron: '21 21 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23414,20 +15692,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -23439,18 +15718,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flatcar-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k21-ko21-containerd
-  cron: '5 7 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-containerd
+  cron: '13 0 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23477,14 +15757,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23502,18 +15782,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k21-ko22-containerd
-  cron: '29 15 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-ko21-containerd
+  cron: '33 23 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23540,14 +15820,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23565,18 +15845,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel7-k22-ko22-containerd
-  cron: '33 11 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k20-ko22-containerd
+  cron: '37 7 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23603,14 +15883,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23628,19 +15908,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel7-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-containerd
-  cron: '9 21 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-containerd
+  cron: '30 7 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23667,14 +15946,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23693,17 +15972,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-containerd
+    testgrid-tab-name: kops-grid-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-ko21-containerd
-  cron: '16 10 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-ko21-containerd
+  cron: '50 12 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23730,14 +16009,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23756,17 +16035,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k20-ko22-containerd
-  cron: '24 10 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k21-ko22-containerd
+  cron: '58 4 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23793,14 +16072,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23819,17 +16098,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-containerd
-  cron: '22 10 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k22-containerd
+  cron: '2 7 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23856,14 +16135,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23882,17 +16161,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-containerd
+    testgrid-tab-name: kops-grid-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-ko21-containerd
-  cron: '7 1 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-rhel8-k22-ko22-containerd
+  cron: '10 16 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23919,14 +16199,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -23945,17 +16225,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-rhel8-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k21-ko22-containerd
-  cron: '35 17 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-containerd
+  cron: '55 18 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -23982,20 +16263,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24007,18 +16288,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-u2004-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k22-containerd
-  cron: '38 18 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-ko21-containerd
+  cron: '44 14 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24045,20 +16326,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24070,19 +16351,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k22-containerd
+    testgrid-tab-name: kops-grid-u2004-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-rhel8-k22-ko22-containerd
-  cron: '59 13 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k20-ko22-containerd
+  cron: '16 22 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24109,20 +16389,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24134,19 +16414,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-rhel8-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-u2004-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k20-ko21-containerd
-  cron: '35 5 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-containerd
+  cron: '40 13 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24173,14 +16452,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -24198,18 +16477,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-u2004-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k20-ko22-containerd
-  cron: '7 21 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-ko21-containerd
+  cron: '11 21 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24236,14 +16515,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -24261,18 +16540,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-u2004-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k21-ko21-containerd
-  cron: '56 22 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k21-ko22-containerd
+  cron: '31 5 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24299,8 +16578,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -24324,18 +16603,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-u2004-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k21-ko22-containerd
-  cron: '16 14 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k22-containerd
+  cron: '4 5 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24362,14 +16641,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -24387,18 +16666,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-u2004-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u1804-k22-ko22-containerd
-  cron: '48 18 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kubenet"}
+- name: e2e-kops-grid-u2004-k22-ko22-containerd
+  cron: '47 1 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24425,7 +16705,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=kubenet --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -24450,19 +16730,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: kubenet
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u1804-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-u2004-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-containerd
-  cron: '39 23 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-containerd
+  cron: '51 3 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24489,7 +16769,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -24502,7 +16782,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24514,18 +16794,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-ko21-containerd
-  cron: '53 3 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-ko21-containerd
+  cron: '14 8 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24552,7 +16832,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -24565,7 +16845,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24577,18 +16857,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k20-ko22-containerd
-  cron: '25 11 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k20-ko22-containerd
+  cron: '30 16 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24615,7 +16895,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -24628,7 +16908,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24640,18 +16920,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-containerd
-  cron: '44 8 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-containerd
+  cron: '16 4 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24678,7 +16958,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -24691,7 +16971,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24703,18 +16983,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-ko21-containerd
-  cron: '50 8 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-ko21-containerd
+  cron: '21 19 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24741,7 +17021,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -24754,7 +17034,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24766,18 +17046,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k21-ko22-containerd
-  cron: '30 0 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k21-ko22-containerd
+  cron: '17 11 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24804,7 +17084,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -24817,7 +17097,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24829,18 +17109,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k22-containerd
-  cron: '28 16 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k22-containerd
+  cron: '44 4 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24867,7 +17147,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -24880,7 +17160,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24892,19 +17172,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k22-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
-- name: e2e-kops-grid-calico-u2004-k22-ko22-containerd
-  cron: '58 4 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-amzn2-k22-ko22-containerd
+  cron: '45 23 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24931,7 +17211,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -24944,7 +17224,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -24956,19 +17236,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-calico-u2004-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-containerd
-  cron: '37 1 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-containerd
+  cron: '6 10 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -24995,7 +17275,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -25008,7 +17288,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25020,18 +17300,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-ko21-containerd
-  cron: '14 12 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-ko21-containerd
+  cron: '48 10 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25058,7 +17338,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -25071,7 +17351,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25083,18 +17363,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k20-ko22-containerd
-  cron: '34 12 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k20-ko22-containerd
+  cron: '56 18 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25121,7 +17401,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -25134,7 +17414,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25146,18 +17426,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-containerd
-  cron: '46 22 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-containerd
+  cron: '9 21 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25184,7 +17464,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -25197,7 +17477,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25209,18 +17489,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-ko21-containerd
-  cron: '41 15 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-ko21-containerd
+  cron: '3 9 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25247,7 +17527,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -25260,7 +17540,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25272,18 +17552,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k21-ko22-containerd
-  cron: '1 23 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k21-ko22-containerd
+  cron: '11 17 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25310,7 +17590,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -25323,7 +17603,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25335,18 +17615,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k22-containerd
-  cron: '6 22 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k22-containerd
+  cron: '17 13 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25373,7 +17653,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -25386,7 +17666,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25398,19 +17678,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k22-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-amzn2-k22-ko22-containerd
-  cron: '13 11 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-deb10-k22-ko22-containerd
+  cron: '11 5 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25437,7 +17717,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -25450,7 +17730,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25462,19 +17742,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-amzn2-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-containerd
-  cron: '40 0 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-containerd
+  cron: '21 2 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25501,9 +17781,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25514,7 +17795,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25526,18 +17807,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-ko21-containerd
-  cron: '32 6 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-ko21-containerd
+  cron: '17 8 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25564,9 +17845,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25577,7 +17859,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25589,18 +17871,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k20-ko22-containerd
-  cron: '44 22 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k20-ko22-containerd
+  cron: '5 0 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25627,9 +17909,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25640,7 +17923,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25652,18 +17935,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-containerd
-  cron: '3 7 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-containerd
+  cron: '22 5 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25690,9 +17973,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25703,7 +17987,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25715,18 +17999,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-ko21-containerd
-  cron: '59 13 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-ko21-containerd
+  cron: '22 11 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25753,9 +18037,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25766,7 +18051,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25778,18 +18063,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k21-ko22-containerd
-  cron: '51 21 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k21-ko22-containerd
+  cron: '26 11 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25816,9 +18101,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25829,7 +18115,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25841,18 +18127,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k22-containerd
-  cron: '31 7 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k22-containerd
+  cron: '14 13 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25879,9 +18165,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25892,7 +18179,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25904,19 +18191,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k22-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-deb10-k22-ko22-containerd
-  cron: '47 17 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-flatcar-k22-ko22-containerd
+  cron: '30 23 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -25943,9 +18230,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -25956,7 +18244,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -25968,19 +18256,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-deb10-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-flatcar-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-containerd
-  cron: '7 7 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-containerd
+  cron: '9 21 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26007,7 +18295,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26036,14 +18324,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-ko21-containerd
-  cron: '8 14 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-ko21-containerd
+  cron: '16 10 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26070,7 +18358,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26099,14 +18387,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k20-ko22-containerd
-  cron: '44 14 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k20-ko22-containerd
+  cron: '24 10 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26133,7 +18421,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26162,14 +18450,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-containerd
-  cron: '36 8 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-containerd
+  cron: '22 10 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26196,7 +18484,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26225,14 +18513,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-ko21-containerd
-  cron: '39 21 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-ko21-containerd
+  cron: '7 1 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26259,7 +18547,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26288,14 +18576,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k21-ko22-containerd
-  cron: '15 13 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k21-ko22-containerd
+  cron: '35 17 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26322,7 +18610,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26351,14 +18639,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k22-containerd
-  cron: '12 0 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k22-containerd
+  cron: '38 18 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26385,7 +18673,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -26415,14 +18703,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k22-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-rhel8-k22-ko22-containerd
-  cron: '43 9 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-rhel8-k22-ko22-containerd
+  cron: '59 13 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26449,7 +18737,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -26479,14 +18767,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-rhel8-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-rhel8-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-containerd
-  cron: '33 13 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-containerd
+  cron: '39 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26513,7 +18801,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26542,14 +18830,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-ko21-containerd
-  cron: '5 23 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-ko21-containerd
+  cron: '53 3 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26576,7 +18864,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26605,14 +18893,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k20-ko22-containerd
-  cron: '13 15 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k20-ko22-containerd
+  cron: '25 11 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26639,7 +18927,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -26668,14 +18956,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-containerd
-  cron: '18 18 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-containerd
+  cron: '44 8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26702,7 +18990,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26731,14 +19019,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-ko21-containerd
-  cron: '26 12 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-ko21-containerd
+  cron: '50 8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26765,7 +19053,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26794,14 +19082,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k21-ko22-containerd
-  cron: '46 4 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k21-ko22-containerd
+  cron: '30 0 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26828,7 +19116,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -26857,14 +19145,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k22-containerd
-  cron: '2 10 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k22-containerd
+  cron: '28 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26891,7 +19179,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -26921,14 +19209,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k22-containerd
+    testgrid-tab-name: kops-grid-calico-u2004-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
-- name: e2e-kops-grid-cilium-u2004-k22-ko22-containerd
-  cron: '22 16 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "calico"}
+- name: e2e-kops-grid-calico-u2004-k22-ko22-containerd
+  cron: '58 4 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -26955,7 +19243,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -26985,14 +19273,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium
+    test.kops.k8s.io/networking: calico
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-u2004-k22-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-containerd
-  cron: '3 21 * * 2'
+    testgrid-tab-name: kops-grid-calico-u2004-k22-ko22-containerd
+
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-containerd
+  cron: '37 1 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27019,7 +19307,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27048,14 +19336,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko21-containerd
-  cron: '2 20 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-ko21-containerd
+  cron: '14 12 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27082,7 +19370,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27111,14 +19399,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko22-containerd
-  cron: '2 20 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k20-ko22-containerd
+  cron: '34 12 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27145,7 +19433,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27174,14 +19462,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-containerd
-  cron: '56 10 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-containerd
+  cron: '46 22 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27208,7 +19496,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27237,14 +19525,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko21-containerd
-  cron: '41 7 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-ko21-containerd
+  cron: '41 15 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27271,7 +19559,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27300,14 +19588,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko22-containerd
-  cron: '17 15 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k21-ko22-containerd
+  cron: '1 23 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27334,7 +19622,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27363,14 +19651,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k22-containerd
-  cron: '4 10 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k22-containerd
+  cron: '6 22 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27397,7 +19685,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -27427,14 +19715,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-amzn2-k22-ko22-containerd
-  cron: '9 19 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-amzn2-k22-ko22-containerd
+  cron: '13 11 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27461,7 +19749,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -27491,14 +19779,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-containerd
-  cron: '34 20 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-containerd
+  cron: '40 0 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27525,7 +19813,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27554,14 +19842,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko21-containerd
-  cron: '24 14 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-ko21-containerd
+  cron: '32 6 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27588,7 +19876,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27617,14 +19905,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko22-containerd
-  cron: '40 22 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k20-ko22-containerd
+  cron: '44 22 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27651,7 +19939,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -27680,14 +19968,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-containerd
-  cron: '1 19 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-containerd
+  cron: '3 7 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27714,7 +20002,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27743,14 +20031,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko21-containerd
-  cron: '19 21 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-ko21-containerd
+  cron: '59 13 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27777,7 +20065,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27806,14 +20094,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko22-containerd
-  cron: '15 13 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k21-ko22-containerd
+  cron: '51 21 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27840,7 +20128,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -27869,14 +20157,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k22-containerd
-  cron: '17 3 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k22-containerd
+  cron: '31 7 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27903,7 +20191,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -27933,14 +20221,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-deb10-k22-ko22-containerd
-  cron: '31 17 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-deb10-k22-ko22-containerd
+  cron: '47 17 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -27967,7 +20255,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -27997,14 +20285,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-containerd
-  cron: '13 3 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-containerd
+  cron: '7 7 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28031,7 +20319,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28060,14 +20348,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko21-containerd
-  cron: '12 22 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-ko21-containerd
+  cron: '8 14 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28094,7 +20382,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28123,14 +20411,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko22-containerd
-  cron: '24 22 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k20-ko22-containerd
+  cron: '44 14 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28157,7 +20445,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28186,14 +20474,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-containerd
-  cron: '18 4 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-containerd
+  cron: '36 8 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28220,7 +20508,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28249,14 +20537,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko21-containerd
-  cron: '23 21 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-ko21-containerd
+  cron: '39 21 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28283,7 +20571,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28312,14 +20600,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko22-containerd
-  cron: '15 21 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k21-ko22-containerd
+  cron: '15 13 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28346,7 +20634,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28375,14 +20663,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k22-containerd
-  cron: '58 20 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k22-containerd
+  cron: '12 0 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28409,7 +20697,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -28439,14 +20727,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-rhel8-k22-ko22-containerd
-  cron: '19 17 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-rhel8-k22-ko22-containerd
+  cron: '43 9 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28473,7 +20761,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -28503,14 +20791,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-rhel8-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-containerd
-  cron: '47 17 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-containerd
+  cron: '33 13 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28537,7 +20825,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28566,14 +20854,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko21-containerd
-  cron: '21 23 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-ko21-containerd
+  cron: '5 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28600,7 +20888,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28629,14 +20917,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko22-containerd
-  cron: '53 7 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k20-ko22-containerd
+  cron: '13 15 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28663,7 +20951,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -28692,14 +20980,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-containerd
-  cron: '44 6 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-containerd
+  cron: '18 18 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28726,7 +21014,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28755,14 +21043,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko21-containerd
-  cron: '46 12 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-ko21-containerd
+  cron: '26 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28789,7 +21077,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28818,14 +21106,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko22-containerd
-  cron: '30 12 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k21-ko22-containerd
+  cron: '46 4 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28852,7 +21140,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -28881,14 +21169,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k22-containerd
-  cron: '0 22 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k22-containerd
+  cron: '2 10 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28915,7 +21203,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -28945,14 +21233,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
-- name: e2e-kops-grid-cilium-etcd-u2004-k22-ko22-containerd
-  cron: '34 8 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium"}
+- name: e2e-kops-grid-cilium-u2004-k22-ko22-containerd
+  cron: '22 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -28979,7 +21267,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -29009,14 +21297,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: cilium-etcd
+    test.kops.k8s.io/networking: cilium
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-u2004-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-containerd
-  cron: '35 8 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-containerd
+  cron: '3 21 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29043,7 +21331,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -29072,14 +21360,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-ko21-containerd
-  cron: '37 3 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko21-containerd
+  cron: '2 20 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29106,7 +21394,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -29135,14 +21423,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k20-ko22-containerd
-  cron: '9 3 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k20-ko22-containerd
+  cron: '2 20 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29169,7 +21457,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -29198,14 +21486,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-containerd
-  cron: '56 23 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-containerd
+  cron: '56 10 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29232,7 +21520,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -29261,14 +21549,14 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-ko21-containerd
-  cron: '26 16 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko21-containerd
+  cron: '41 7 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29295,7 +21583,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -29324,14 +21612,77 @@ periodics:
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
+    test.kops.k8s.io/networking: cilium-etcd
     testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k21-ko22-containerd
-  cron: '50 8 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k21-ko22-containerd
+  cron: '17 15 * * 6'
+  labels:
+    preset-service-account: "true"
+    preset-aws-ssh: "true"
+    preset-aws-credential: "true"
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=aws \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --test=kops \
+          -- \
+          --ginkgo-args="--debug" \
+          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-package-marker=stable-1.21.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/aws-ssh/aws-ssh-private
+      - name: KUBE_SSH_USER
+        value: ec2-user
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          memory: 3Gi
+        requests:
+          cpu: "2"
+          memory: 3Gi
+  annotations:
+    test.kops.k8s.io/cloud: aws
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '90'
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k21-ko22-containerd
+
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k22-containerd
+  cron: '4 10 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29358,14 +21709,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -29384,17 +21735,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k22-containerd
-  cron: '12 15 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-amzn2-k22-ko22-containerd
+  cron: '9 19 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29421,8 +21773,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
@@ -29450,15 +21802,15 @@ periodics:
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-amzn2-k22-ko22-containerd
-  cron: '10 4 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-containerd
+  cron: '34 20 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29485,20 +21837,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -29510,19 +21862,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-amzn2-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k20-ko21-containerd
-  cron: '3 1 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko21-containerd
+  cron: '24 14 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29549,7 +21900,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -29574,18 +21925,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k20-ko22-containerd
-  cron: '27 17 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k20-ko22-containerd
+  cron: '40 22 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29612,7 +21963,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -29637,18 +21988,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k21-ko21-containerd
-  cron: '4 18 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-containerd
+  cron: '1 19 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29675,8 +22026,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -29700,18 +22051,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k21-ko22-containerd
-  cron: '24 18 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko21-containerd
+  cron: '19 21 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29738,8 +22089,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -29763,18 +22114,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb9-k22-ko22-containerd
-  cron: '20 14 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k21-ko22-containerd
+  cron: '15 13 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29801,14 +22152,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -29826,19 +22177,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb9-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-containerd
-  cron: '58 9 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k22-containerd
+  cron: '17 3 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29865,14 +22215,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -29891,17 +22241,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-ko21-containerd
-  cron: '15 1 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-deb10-k22-ko22-containerd
+  cron: '31 17 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29928,14 +22279,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -29954,17 +22305,18 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k20-ko22-containerd
-  cron: '39 1 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-containerd
+  cron: '13 3 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -29991,8 +22343,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -30004,7 +22356,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30016,18 +22368,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-containerd
-  cron: '29 22 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko21-containerd
+  cron: '12 22 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30054,20 +22406,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30079,18 +22431,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-ko21-containerd
-  cron: '16 18 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k20-ko22-containerd
+  cron: '24 22 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30117,20 +22469,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30142,18 +22494,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k21-ko22-containerd
-  cron: '28 10 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-containerd
+  cron: '18 4 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30180,8 +22532,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -30193,7 +22545,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30205,18 +22557,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k22-containerd
-  cron: '33 22 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko21-containerd
+  cron: '23 21 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30243,20 +22595,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30268,19 +22620,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-deb10-k22-ko22-containerd
-  cron: '16 6 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k21-ko22-containerd
+  cron: '15 21 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30307,20 +22658,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30332,19 +22683,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-deb10-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-containerd
-  cron: '2 18 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k22-containerd
+  cron: '58 20 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30371,21 +22721,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30397,18 +22746,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-ko21-containerd
-  cron: '51 2 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-rhel8-k22-ko22-containerd
+  cron: '19 17 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30435,21 +22785,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30461,18 +22810,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-rhel8-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k20-ko22-containerd
-  cron: '47 18 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-containerd
+  cron: '47 17 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30499,10 +22849,9 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -30513,7 +22862,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30525,18 +22874,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-containerd
-  cron: '9 13 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko21-containerd
+  cron: '21 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30563,21 +22912,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30589,18 +22937,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-ko21-containerd
-  cron: '20 1 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k20-ko22-containerd
+  cron: '53 7 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30627,21 +22975,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30653,18 +23000,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k21-ko22-containerd
-  cron: '12 17 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-containerd
+  cron: '44 6 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30691,10 +23038,9 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -30705,7 +23051,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30717,18 +23063,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k22-containerd
-  cron: '5 13 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko21-containerd
+  cron: '46 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30755,21 +23101,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30781,19 +23126,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
-    test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-flatcar-k22-ko22-containerd
-  cron: '28 21 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k21-ko22-containerd
+  cron: '30 12 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30820,21 +23164,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30846,19 +23189,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-flatcar-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k20-ko21-containerd
-  cron: '49 7 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k22-containerd
+  cron: '0 22 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30885,20 +23227,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30910,18 +23252,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k20-ko22-containerd
-  cron: '49 7 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "cilium-etcd"}
+- name: e2e-kops-grid-cilium-etcd-u2004-k22-ko22-containerd
+  cron: '34 8 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -30948,20 +23291,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=cilium-etcd --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -30973,18 +23316,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: cilium-etcd
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-cilium-etcd-u2004-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k21-ko21-containerd
-  cron: '54 12 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-containerd
+  cron: '35 8 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31011,14 +23355,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31036,18 +23380,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k21-ko22-containerd
-  cron: '38 20 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-ko21-containerd
+  cron: '37 3 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31074,14 +23418,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31099,18 +23443,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel7-k22-ko22-containerd
-  cron: '38 8 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k20-ko22-containerd
+  cron: '9 3 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31137,14 +23481,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31162,19 +23506,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel7-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-containerd
-  cron: '41 6 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-containerd
+  cron: '56 23 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31201,14 +23544,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31226,18 +23569,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-ko21-containerd
-  cron: '35 9 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-ko21-containerd
+  cron: '26 16 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31264,14 +23607,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31289,18 +23632,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k20-ko22-containerd
-  cron: '51 9 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k21-ko22-containerd
+  cron: '50 8 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31327,14 +23670,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31352,18 +23695,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-containerd
-  cron: '18 1 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k22-containerd
+  cron: '12 15 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31390,14 +23733,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31415,18 +23758,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-ko21-containerd
-  cron: '20 10 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-amzn2-k22-ko22-containerd
+  cron: '10 4 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31453,14 +23797,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -31478,18 +23822,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k21-ko22-containerd
-  cron: '28 10 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-containerd
+  cron: '58 9 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31516,20 +23861,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31541,18 +23886,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko22-containerd
-
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k22-containerd
-  cron: '18 17 * * 1'
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-containerd
+
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-ko21-containerd
+  cron: '15 1 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31579,20 +23924,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31604,19 +23949,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k22-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-rhel8-k22-ko22-containerd
-  cron: '4 14 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k20-ko22-containerd
+  cron: '39 1 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31643,20 +23987,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31668,19 +24012,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-rhel8-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k20-ko21-containerd
-  cron: '56 14 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-containerd
+  cron: '29 22 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31707,20 +24050,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31732,18 +24075,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k20-ko22-containerd
-  cron: '28 14 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-ko21-containerd
+  cron: '16 18 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31770,20 +24113,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31795,18 +24138,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k21-ko21-containerd
-  cron: '31 5 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k21-ko22-containerd
+  cron: '28 10 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31833,8 +24176,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -31846,7 +24189,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31858,18 +24201,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k21-ko22-containerd
-  cron: '7 21 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k22-containerd
+  cron: '33 22 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31896,20 +24239,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31921,18 +24264,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u1804-k22-ko22-containerd
-  cron: '31 9 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-deb10-k22-ko22-containerd
+  cron: '16 6 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -31959,7 +24303,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -31972,7 +24316,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -31984,19 +24328,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u1804-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-containerd
-  cron: '55 12 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-containerd
+  cron: '2 18 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32023,9 +24367,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32036,7 +24381,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32048,18 +24393,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-ko21-containerd
-  cron: '38 16 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-ko21-containerd
+  cron: '51 2 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32086,9 +24431,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32099,7 +24445,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32111,18 +24457,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k20-ko22-containerd
-  cron: '54 0 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k20-ko22-containerd
+  cron: '47 18 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32149,9 +24495,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32162,7 +24509,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32174,18 +24521,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-containerd
-  cron: '12 3 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-containerd
+  cron: '9 13 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32212,9 +24559,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32225,7 +24573,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32237,18 +24585,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-ko21-containerd
-  cron: '9 19 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-ko21-containerd
+  cron: '20 1 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32275,9 +24623,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32288,7 +24637,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32300,18 +24649,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k21-ko22-containerd
-  cron: '49 11 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k21-ko22-containerd
+  cron: '12 17 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32338,9 +24687,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32351,7 +24701,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32363,18 +24713,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k22-containerd
-  cron: '12 3 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k22-containerd
+  cron: '5 13 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32401,9 +24751,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32414,7 +24765,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32426,19 +24777,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k22-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
-- name: e2e-kops-grid-flannel-u2004-k22-ko22-containerd
-  cron: '25 23 * * *'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-flatcar-k22-ko22-containerd
+  cron: '28 21 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32465,9 +24816,10 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -32478,7 +24830,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -32490,19 +24842,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/distro: flatcar
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: flannel
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-flannel-u2004-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-flatcar-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-containerd
-  cron: '48 0 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-containerd
+  cron: '41 6 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32529,7 +24881,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -32554,18 +24906,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-ko21-containerd
-  cron: '34 16 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-ko21-containerd
+  cron: '35 9 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32592,7 +24944,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -32617,18 +24969,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k20-ko22-containerd
-  cron: '42 8 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k20-ko22-containerd
+  cron: '51 9 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32655,7 +25007,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -32680,18 +25032,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-containerd
-  cron: '31 15 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-containerd
+  cron: '18 1 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32718,7 +25070,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -32743,18 +25095,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-ko21-containerd
-  cron: '1 11 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-ko21-containerd
+  cron: '20 10 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32781,7 +25133,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -32806,18 +25158,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k21-ko22-containerd
-  cron: '9 3 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k21-ko22-containerd
+  cron: '28 10 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32844,7 +25196,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
@@ -32869,18 +25221,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k22-containerd
-  cron: '47 15 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k22-containerd
+  cron: '18 17 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32907,7 +25259,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -32932,19 +25284,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-amzn2-k22-ko22-containerd
-  cron: '53 23 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-rhel8-k22-ko22-containerd
+  cron: '4 14 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -32971,7 +25323,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -32996,19 +25348,82 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-rhel8-k22-ko22-containerd
+
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-containerd
+  cron: '55 12 * * *'
+  labels:
+    preset-service-account: "true"
+    preset-aws-ssh: "true"
+    preset-aws-credential: "true"
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=aws \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --test=kops \
+          -- \
+          --ginkgo-args="--debug" \
+          --test-args="-test.timeout=60m -num-nodes=0" \
+          --test-package-marker=stable-1.20.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/aws-ssh/aws-ssh-private
+      - name: KUBE_SSH_USER
+        value: ubuntu
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          memory: 3Gi
+        requests:
+          cpu: "2"
+          memory: 3Gi
+  annotations:
+    test.kops.k8s.io/cloud: aws
+    test.kops.k8s.io/container_runtime: containerd
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '90'
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k20-ko21-containerd
-  cron: '4 12 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-ko21-containerd
+  cron: '38 16 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33035,7 +25450,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -33048,7 +25463,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33060,18 +25475,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k20-ko22-containerd
-  cron: '36 12 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k20-ko22-containerd
+  cron: '54 0 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33098,7 +25513,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
@@ -33111,7 +25526,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33123,18 +25538,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k21-ko21-containerd
-  cron: '3 7 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-containerd
+  cron: '12 3 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33161,8 +25576,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -33174,7 +25589,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33186,18 +25601,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k21-ko22-containerd
-  cron: '43 15 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-ko21-containerd
+  cron: '9 19 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33224,8 +25639,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -33237,7 +25652,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33249,18 +25664,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
+    test.kops.k8s.io/distro: u2004
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb9", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb9-k22-ko22-containerd
-  cron: '59 11 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k21-ko22-containerd
+  cron: '49 11 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33287,20 +25702,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='379101102735/debian-stretch-hvm-x86_64-gp2-2021-11-24-64028' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33312,19 +25727,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb9
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb9, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb9-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-containerd
-  cron: '29 17 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k22-containerd
+  cron: '12 3 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33351,20 +25765,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33376,18 +25790,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-distro-u2004, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-ko21-containerd
-  cron: '28 10 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "flannel"}
+- name: e2e-kops-grid-flannel-u2004-k22-ko22-containerd
+  cron: '25 23 * * *'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33414,20 +25829,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20211129' --channel=alpha --networking=flannel --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ubuntu
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33439,18 +25854,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: u2004
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
-    test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/networking: flannel
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u2004, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-flannel-u2004-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k20-ko22-containerd
-  cron: '44 2 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-containerd
+  cron: '48 0 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33477,8 +25893,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
@@ -33490,7 +25906,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33502,18 +25918,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-containerd
-  cron: '14 14 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-ko21-containerd
+  cron: '34 16 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33540,20 +25956,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33565,18 +25981,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-ko21-containerd
-  cron: '55 9 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k20-ko22-containerd
+  cron: '42 8 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33603,20 +26019,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33628,18 +26044,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k21-ko22-containerd
-  cron: '51 9 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-containerd
+  cron: '31 15 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33666,8 +26082,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -33679,7 +26095,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33691,18 +26107,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/distro: amzn2
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k22-containerd
-  cron: '50 14 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-ko21-containerd
+  cron: '1 11 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33729,20 +26145,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33754,19 +26170,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k22-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-deb10-k22-ko22-containerd
-  cron: '3 5 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k21-ko22-containerd
+  cron: '9 3 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33793,20 +26208,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: admin
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33818,19 +26233,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: deb10
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-deb10-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-containerd
-  cron: '15 12 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k22-containerd
+  cron: '47 15 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33857,21 +26271,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33883,18 +26296,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-amzn2, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-ko21-containerd
-  cron: '53 8 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "amzn2", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-amzn2-k22-ko22-containerd
+  cron: '53 23 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33921,21 +26335,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211201.0-x86_64-gp2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -33947,18 +26360,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: amzn2
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-amzn2, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-amzn2-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k20-ko22-containerd
-  cron: '17 8 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-containerd
+  cron: '29 17 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -33985,10 +26399,9 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
-          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -33999,7 +26412,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34011,18 +26424,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-containerd
-  cron: '16 11 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-ko21-containerd
+  cron: '28 10 * * 5'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34049,21 +26462,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34075,18 +26487,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-ko21-containerd
-  cron: '14 19 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k20-ko22-containerd
+  cron: '44 2 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34113,21 +26525,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34139,18 +26550,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k21-ko22-containerd
-  cron: '2 11 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-containerd
+  cron: '14 14 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34177,10 +26588,9 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
-          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
@@ -34191,7 +26601,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34203,18 +26613,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/distro: deb10
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k22-containerd
-  cron: '4 11 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-ko21-containerd
+  cron: '55 9 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34241,21 +26651,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34267,19 +26676,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-flatcar-k22-ko22-containerd
-  cron: '46 7 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k21-ko22-containerd
+  cron: '51 9 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34306,21 +26714,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
-          --validation-wait=20m \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: core
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34332,19 +26739,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: flatcar
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k20-ko21-containerd
-  cron: '30 12 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k22-containerd
+  cron: '50 14 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34371,20 +26777,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34396,18 +26802,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-deb10, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k20-ko22-containerd
-  cron: '42 4 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "deb10", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-deb10-k22-ko22-containerd
+  cron: '3 5 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34434,20 +26841,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='136693071363/debian-10-amd64-20211011-792' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: admin
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34459,18 +26866,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: deb10
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-deb10, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-deb10-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k21-ko21-containerd
-  cron: '17 23 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-containerd
+  cron: '15 12 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34497,20 +26905,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34522,18 +26931,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k21-ko22-containerd
-  cron: '21 15 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-ko21-containerd
+  cron: '53 8 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34560,20 +26969,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34585,18 +26995,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel7", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel7-k22-ko22-containerd
-  cron: '49 19 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k20-ko22-containerd
+  cron: '17 8 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34623,20 +27033,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-7.9_HVM_GA-20200917-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34648,19 +27059,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel7
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel7, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel7-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-containerd
-  cron: '18 6 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-containerd
+  cron: '16 11 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34687,20 +27097,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34712,18 +27123,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-ko21-containerd
-  cron: '20 18 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-ko21-containerd
+  cron: '14 19 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34750,20 +27161,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34775,18 +27187,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k20-ko22-containerd
-  cron: '48 18 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k21-ko22-containerd
+  cron: '2 11 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34813,20 +27225,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34838,18 +27251,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-containerd
-  cron: '29 9 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k22-containerd
+  cron: '4 11 * * 4'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34876,20 +27289,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34901,18 +27315,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-flatcar, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-ko21-containerd
-  cron: '51 9 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "flatcar", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-flatcar-k22-ko22-containerd
+  cron: '46 7 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -34939,20 +27354,21 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.1-hvm' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --validation-wait=20m \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ec2-user
+        value: core
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -34964,18 +27380,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: flatcar
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-flatcar, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-flatcar-k22-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k21-ko22-containerd
-  cron: '19 9 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-containerd
+  cron: '18 6 * * 6'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35003,13 +27420,13 @@ periodics:
           --up --down \
           --cloud-provider=aws \
           --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -35028,17 +27445,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.20, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k22-containerd
-  cron: '1 9 * * 0'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-ko21-containerd
+  cron: '20 18 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35065,14 +27482,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -35091,18 +27508,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: ''
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-rhel8-k22-ko22-containerd
-  cron: '43 5 * * 1'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k20-ko22-containerd
+  cron: '48 18 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35129,14 +27545,14 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.22.txt \
+          --test-package-marker=stable-1.20.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
@@ -35155,18 +27571,17 @@ periodics:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
     test.kops.k8s.io/distro: rhel8
-    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
-    test.kops.k8s.io/k8s_version: '1.22'
+    test.kops.k8s.io/k8s_version: '1.20'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k20-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k20-ko21-containerd
-  cron: '31 5 * * 4'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-containerd
+  cron: '29 9 * * 3'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35193,20 +27608,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -35218,18 +27633,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.21, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k20-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k20-ko22-containerd
-  cron: '15 13 * * 2'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-ko21-containerd
+  cron: '51 9 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35256,20 +27671,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.20.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.20.txt \
+          --test-package-marker=stable-1.21.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -35281,18 +27696,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.20'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: '1.21'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.20, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.21, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k20-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko21-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.21", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k21-ko21-containerd
-  cron: '8 14 * * 3'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k21-ko22-containerd
+  cron: '19 9 * * 2'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35319,8 +27734,8 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.21/latest-ci-updown-green.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
           --test=kops \
           -- \
@@ -35332,7 +27747,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -35344,18 +27759,18 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/k8s_version: '1.21'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.21'
+    test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.21, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k21-ko21-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k21-ko22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "k8s_version": "1.21", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k21-ko22-containerd
-  cron: '4 14 * * 6'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k22-containerd
+  cron: '1 9 * * 0'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35382,20 +27797,20 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=containerd" \
-          --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.21.txt \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
+          --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-marker=stable-1.21.txt \
+          --test-package-marker=stable-1.22.txt \
           --parallel=25
       env:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -35407,18 +27822,19 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
-    test.kops.k8s.io/k8s_version: '1.21'
+    test.kops.k8s.io/distro: rhel8
+    test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
+    test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
-    test.kops.k8s.io/kops_version: '1.22'
+    test.kops.k8s.io/kops_version: ''
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.21, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-distro-rhel8, kops-grid, kops-k8s-1.22, kops-latest, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k21-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-containerd
 
-# {"cloud": "aws", "container_runtime": "containerd", "distro": "u1804", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
-- name: e2e-kops-grid-kopeio-u1804-k22-ko22-containerd
-  cron: '0 2 * * 5'
+# {"cloud": "aws", "container_runtime": "containerd", "distro": "rhel8", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.22", "kops_channel": "alpha", "kops_version": "1.22", "networking": "kopeio"}
+- name: e2e-kops-grid-kopeio-rhel8-k22-ko22-containerd
+  cron: '43 5 * * 1'
   labels:
     preset-service-account: "true"
     preset-aws-ssh: "true"
@@ -35445,7 +27861,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20211129' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
+          --create-args="--image='309956199498/RHEL-8.4.0_HVM-20210825-x86_64-0-Hourly2-GP2' --channel=alpha --networking=kopeio --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/markers/release-1.22/latest-ci-updown-green.txt \
           --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable-1.22.txt \
           --test=kops \
@@ -35458,7 +27874,7 @@ periodics:
       - name: KUBE_SSH_KEY_PATH
         value: /etc/aws-ssh/aws-ssh-private
       - name: KUBE_SSH_USER
-        value: ubuntu
+        value: ec2-user
       image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211124-2ed05120f3-master
       imagePullPolicy: Always
       resources:
@@ -35470,15 +27886,15 @@ periodics:
   annotations:
     test.kops.k8s.io/cloud: aws
     test.kops.k8s.io/container_runtime: containerd
-    test.kops.k8s.io/distro: u1804
+    test.kops.k8s.io/distro: rhel8
     test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
     test.kops.k8s.io/k8s_version: '1.22'
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.22'
     test.kops.k8s.io/networking: kopeio
-    testgrid-dashboards: google-aws, kops-1.22, kops-distro-u1804, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
+    testgrid-dashboards: google-aws, kops-1.22, kops-distro-rhel8, kops-grid, kops-k8s-1.22, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
-    testgrid-tab-name: kops-grid-kopeio-u1804-k22-ko22-containerd
+    testgrid-tab-name: kops-grid-kopeio-rhel8-k22-ko22-containerd
 
 # {"cloud": "aws", "container_runtime": "containerd", "distro": "u2004", "k8s_version": "1.20", "kops_channel": "alpha", "kops_version": null, "networking": "kopeio"}
 - name: e2e-kops-grid-kopeio-u2004-k20-containerd