Merge pull request #32456 from chrischdi/pr-1-30-ga-capi

CAPI: adjust jobs due to v1.30 GA
kubernetes · Apr 18, 2024 · 1cabdf0 · 1cabdf0
2 parents 29db47e + fbaa0cd
commit 1cabdf0
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 54 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics-upgrades.yaml
@@ -1,6 +1,6 @@
 # Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
 periodics:
-- name: periodic-cluster-api-e2e-upgrade-1-24-1-25-main
+- name: periodic-cluster-api-e2e-upgrade-1-25-1-26-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -30,11 +30,11 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.24"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
         value: "stable-1.25"
+      - name: KUBERNETES_VERSION_UPGRADE_TO
+        value: "stable-1.26"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.4-0"
+        value: "3.5.6-0"
       - name: COREDNS_VERSION_UPGRADE_TO
         value: "v1.9.3"
       - name: GINKGO_FOCUS
@@ -51,11 +51,11 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-24-1-25
+    testgrid-tab-name: capi-e2e-main-1-25-1-26
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-25-1-26-main
+- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -85,9 +85,9 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.25"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
         value: "stable-1.26"
+      - name: KUBERNETES_VERSION_UPGRADE_TO
+        value: "stable-1.27"
       - name: ETCD_VERSION_UPGRADE_TO
         value: "3.5.6-0"
       - name: COREDNS_VERSION_UPGRADE_TO
@@ -106,11 +106,11 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-25-1-26
+    testgrid-tab-name: capi-e2e-main-1-26-1-27
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-main
+- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -140,13 +140,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.26"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
         value: "stable-1.27"
+      - name: KUBERNETES_VERSION_UPGRADE_TO
+        value: "stable-1.28"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.6-0"
+        value: "3.5.9-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.9.3"
+        value: "v1.10.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -161,11 +161,11 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-26-1-27
+    testgrid-tab-name: capi-e2e-main-1-27-1-28
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-main
+- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -195,13 +195,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.27"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
         value: "stable-1.28"
+      - name: KUBERNETES_VERSION_UPGRADE_TO
+        value: "stable-1.29"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.9-0"
+        value: "3.5.10-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.10.1"
+        value: "v1.11.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -216,11 +216,11 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-27-1-28
+    testgrid-tab-name: capi-e2e-main-1-28-1-29
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-main
+- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -250,11 +250,11 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.28"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
         value: "stable-1.29"
+      - name: KUBERNETES_VERSION_UPGRADE_TO
+        value: "stable-1.30"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.10-0"
+        value: "3.5.12-0"
       - name: COREDNS_VERSION_UPGRADE_TO
         value: "v1.11.1"
       - name: GINKGO_FOCUS
@@ -271,11 +271,11 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-28-1-29
+    testgrid-tab-name: capi-e2e-main-1-29-1-30
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-main
+- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-main
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -305,11 +305,11 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.29"
+        value: "stable-1.30"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "ci/latest-1.30"
+        value: "ci/latest-1.31"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.10-0"
+        value: "3.5.12-0"
       - name: COREDNS_VERSION_UPGRADE_TO
         value: "v1.11.1"
       - name: GINKGO_FOCUS
@@ -326,6 +326,6 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-    testgrid-tab-name: capi-e2e-main-1-29-1-30
+    testgrid-tab-name: capi-e2e-main-1-30-1-31
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
@@ -59,7 +59,7 @@ periodics:
       # To check the latest available envtest in Kubebuilder for the minor version we determined above, please
       # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
       - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
-        value: "1.26.1"
+        value: "v1.27.1"
       resources:
         requests:
           cpu: 7300m
@@ -199,7 +199,7 @@ periodics:
       # Please also make sure to refer a version where a kindest/node image exists
       # for (see https://github.com/kubernetes-sigs/kind/releases/)
       - name: KUBERNETES_VERSION_MANAGEMENT
-        value: "v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
+        value: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml
@@ -125,7 +125,7 @@ presubmits:
         # To check the latest available envtest in Kubebuilder for the minor version we determined above, please
         # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
         - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
-          value: "1.26.1"
+          value: "v1.27.1"
         resources:
           requests:
             cpu: 7300m
@@ -168,7 +168,7 @@ presubmits:
         # Please also make sure to refer a version where a kindest/node image exists
         # for (see https://github.com/kubernetes-sigs/kind/releases/)
         - name: KUBERNETES_VERSION_MANAGEMENT
-          value: "v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
+          value: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -300,7 +300,7 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-e2e-main
-  - name: pull-cluster-api-e2e-upgrade-1-29-1-30-main
+  - name: pull-cluster-api-e2e-upgrade-1-30-1-31-main
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -326,11 +326,11 @@ presubmits:
           - name: ALWAYS_BUILD_KIND_IMAGES
             value: "true"
           - name: KUBERNETES_VERSION_UPGRADE_FROM
-            value: "stable-1.29"
+            value: "stable-1.30"
           - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "ci/latest-1.30"
+            value: "ci/latest-1.31"
           - name: ETCD_VERSION_UPGRADE_TO
-            value: "3.5.10-0"
+            value: "3.5.12-0"
           - name: COREDNS_VERSION_UPGRADE_TO
             value: "v1.11.1"
           - name: GINKGO_FOCUS
@@ -347,7 +347,7 @@ presubmits:
             memory: 6Gi
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
-      testgrid-tab-name: capi-pr-e2e-main-1-29-1-30
+      testgrid-tab-name: capi-pr-e2e-main-1-30-1-31
 
   - name: pull-cluster-api-e2e-conformance-main
     cluster: eks-prow-build-cluster

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml
@@ -35,11 +35,9 @@ prow_ignored:
       testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240409-13cd3acf7e-1.30"
       interval: "2h"
       upgradesInterval: "24h"
-      kubernetesVersionManagement: "v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
-      kubebuilderEnvtestKubernetesVersion: "1.26.1"
+      kubernetesVersionManagement: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
+      kubebuilderEnvtestKubernetesVersion: "v1.27.1"
       upgrades:
-      - from: "1.24"
-        to: "1.25"
       - from: "1.25"
         to: "1.26"
       - from: "1.26"
@@ -50,6 +48,8 @@ prow_ignored:
         to: "1.29"
       - from: "1.29"
         to: "1.30"
+      - from: "1.30"
+        to: "1.31"
     release-1.7:
       testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240409-13cd3acf7e-1.29"
       interval: "4h"
@@ -120,10 +120,6 @@ prow_ignored:
 
   # Versions provides kubernetes minor version to key-value pairs mapping.
   versions:
-    "1.21":
-      etcd: "3.5.3-0"
-      coreDNS: "v1.8.4"
-      k8sRelease: "stable-1.21"
     "1.22":
       etcd: "3.5.3-0"
       coreDNS: "v1.8.4"
@@ -157,6 +153,10 @@ prow_ignored:
       coreDNS: "v1.11.1"
       k8sRelease: "stable-1.29"
     "1.30":
-      etcd: "3.5.10-0"
+      etcd: "3.5.12-0"
+      coreDNS: "v1.11.1"
+      k8sRelease: "stable-1.30"
+    "1.31":
+      etcd: "3.5.12-0"
       coreDNS: "v1.11.1"
-      k8sRelease: "ci/latest-1.30"
+      k8sRelease: "ci/latest-1.31"
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics-upgrades.yaml
@@ -307,9 +307,9 @@ periodics:
       - name: KUBERNETES_VERSION_UPGRADE_FROM
         value: "stable-1.29"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "ci/latest-1.30"
+        value: "stable-1.30"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.10-0"
+        value: "3.5.12-0"
       - name: COREDNS_VERSION_UPGRADE_TO
         value: "v1.11.1"
       - name: GINKGO_FOCUS

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml
@@ -328,9 +328,9 @@ presubmits:
           - name: KUBERNETES_VERSION_UPGRADE_FROM
             value: "stable-1.29"
           - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "ci/latest-1.30"
+            value: "stable-1.30"
           - name: ETCD_VERSION_UPGRADE_TO
-            value: "3.5.10-0"
+            value: "3.5.12-0"
           - name: COREDNS_VERSION_UPGRADE_TO
             value: "v1.11.1"
           - name: GINKGO_FOCUS