Merge pull request #24333 from hakman/pull_e2e_arm64

kOps - Add optional pre-submit for ARM64
kubernetes · Nov 12, 2021 · e5c9533 · e5c9533
2 parents bce61c7 + 4641fd9
commit e5c9533
Show file tree

Hide file tree

Showing 4 changed files with 243 additions and 163 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -1137,6 +1137,18 @@ def generate_presubmits_e2e():
             template_path="/home/prow/go/src/k8s.io/kops/tests/e2e/templates/apiserver.yaml.tmpl",
             feature_flags=['APIServerNodes']
         ),
+
+        presubmit_test(
+            name="pull-kops-e2e-arm64",
+            cloud="aws",
+            distro="u2004arm64",
+            k8s_version="ci",
+            networking="calico",
+            extra_flags=["--zones=eu-central-1a",
+                         "--node-size=m6g.large",
+                         "--master-size=m6g.large"],
+        ),
+
         presubmit_test(
             branch='release-1.22',
             k8s_version='1.22',

diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml
@@ -535,7 +535,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211005.0-x86_64-gp2' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='amazon/amzn2-ami-kernel-5.10-hvm-2.0.20211103.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.txt \
           --test=kops \
@@ -724,7 +724,7 @@ periodics:
           -v 2 \
           --up --down \
           --cloud-provider=aws \
-          --create-args="--image='075585003325/Flatcar-stable-2905.2.6-hvm' --channel=alpha --networking=calico --container-runtime=containerd" \
+          --create-args="--image='075585003325/Flatcar-stable-2983.2.0-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.txt \
           --validation-wait=20m \