Address the review comments

kubernetes · Apr 13, 2023 · ff2c96a · ff2c96a
1 parent 889c52b
commit ff2c96a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml
@@ -51,12 +51,14 @@ periodics:
       - ./scripts/ci-test.sh
       env:
       # This value determines the minimum Kubernetes
-      # supported version for Cluster API management cluster.
+      # supported version for Cluster API management cluster
+      # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
+      # docs (look for minimum supported k8s version for management cluster, i.e N-3).
       #
-      # To check the available envtest in Kubebuilder, please
+      # 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.23.5"
+        value: "1.24.2"
       resources:
         requests:
           cpu: 7300m
@@ -143,7 +145,7 @@ periodics:
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster.
       - name: KUBERNETES_VERSION_MANAGEMENT
-        value: "stable-1.23"
+        value: "stable-1.24"
       # 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-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml
@@ -105,12 +105,14 @@ presubmits:
         - ./scripts/ci-test.sh
         env:
         # This value determines the minimum Kubernetes
-        # supported version for Cluster API management cluster.
+        # supported version for Cluster API management cluster
+        # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
+        # docs (look for minimum supported k8s version for management cluster, i.e N-3).
         #
-        # To check the available envtest in Kubebuilder, please
+        # 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.23.5"
+          value: "1.24.2"
         resources:
           requests:
             cpu: 7300m
@@ -287,7 +289,7 @@ presubmits:
           - name: ETCD_VERSION_UPGRADE_TO
             value: "3.5.7-0"
           - name: COREDNS_VERSION_UPGRADE_TO
-            value: "v1.9.3"
+            value: "v1.10.1"
           - name: GINKGO_FOCUS
             value: "\\[K8s-Upgrade\\]"
         # we need privileged mode in order to do docker in docker

diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-2.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-2.yaml
@@ -250,7 +250,7 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
       testgrid-tab-name: capi-pr-e2e-full-release-1-2
-  - name: pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-2
+  - name: pull-cluster-api-e2e-workload-upgrade-1-25-1-26-release-1-2
     labels:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
@@ -277,11 +277,11 @@ presubmits:
           - "./scripts/ci-e2e.sh"
         env:
           - name: KUBERNETES_VERSION_UPGRADE_FROM
-            value: "stable-1.27"
+            value: "stable-1.25"
           - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "ci/latest-1.28"
+            value: "stable-1.26"
           - name: ETCD_VERSION_UPGRADE_TO
-            value: "3.5.7-0"
+            value: "3.5.6-0"
           - name: COREDNS_VERSION_UPGRADE_TO
             value: "v1.9.3"
           - name: GINKGO_FOCUS
@@ -294,4 +294,4 @@ presubmits:
             cpu: 7300m
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
-      testgrid-tab-name: capi-pr-e2e-release-1-2-1-27-latest
+      testgrid-tab-name: capi-pr-e2e-release-1-2-1-25-1-26
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-3.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-3.yaml
@@ -245,7 +245,7 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.3
       testgrid-tab-name: capi-pr-e2e-full-release-1-3
-  - name: pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-3
+  - name: pull-cluster-api-e2e-workload-upgrade-1-25-1-26-release-1-3
     labels:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
@@ -271,11 +271,11 @@ presubmits:
           - "./scripts/ci-e2e.sh"
         env:
           - name: KUBERNETES_VERSION_UPGRADE_FROM
-            value: "stable-1.27"
+            value: "stable-1.25"
           - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "ci/latest-1.28"
+            value: "stable-1.26"
           - name: ETCD_VERSION_UPGRADE_TO
-            value: "3.5.7-0"
+            value: "3.5.6-0"
           - name: COREDNS_VERSION_UPGRADE_TO
             value: "v1.9.3"
           - name: GINKGO_FOCUS
@@ -288,4 +288,4 @@ presubmits:
             cpu: 7300m
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.3
-      testgrid-tab-name: capi-pr-e2e-release-1-3-1-27-latest
+      testgrid-tab-name: capi-pr-e2e-release-1-3-1-25-1-26
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-4.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-4.yaml
@@ -287,7 +287,7 @@ presubmits:
             - name: ETCD_VERSION_UPGRADE_TO
               value: "3.5.7-0"
             - name: COREDNS_VERSION_UPGRADE_TO
-              value: "v1.9.3"
+              value: "v1.10.1"
             - name: GINKGO_FOCUS
               value: "\\[K8s-Upgrade\\]"
           # we need privileged mode in order to do docker in docker