From d9c2acb75d4a1507b46503fca84699c6d4775c9b Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 10 Aug 2023 07:50:52 +0200 Subject: [PATCH] CAPI: bump jobs for v1.28 --- .../cluster-api-periodics-main-upgrades.yaml | 112 +++++++++--------- .../cluster-api-periodics-main.yaml | 6 +- ...er-api-periodics-release-1-5-upgrades.yaml | 8 +- .../cluster-api-presubmits-main.yaml | 12 +- .../cluster-api-presubmits-release-1-5.yaml | 8 +- 5 files changed, 74 insertions(+), 72 deletions(-) diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml index dbf57ecf8669..bff12ed7884e 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml @@ -1,58 +1,5 @@ periodics: -- name: periodic-cluster-api-e2e-workload-upgrade-1-22-1-23-main - interval: 24h - decorate: true - decoration_config: - gcs_credentials_secret: "" # Use workload identity for uploading artifacts - rerun_auth_config: - github_team_slugs: - - org: kubernetes-sigs - slug: cluster-api-maintainers - labels: - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" - extra_refs: - - org: kubernetes-sigs - repo: cluster-api - base_ref: main - path_alias: sigs.k8s.io/cluster-api - - org: kubernetes - repo: kubernetes - base_ref: master - path_alias: k8s.io/kubernetes - spec: - serviceAccountName: prowjob-default-sa - containers: - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-1.27 - args: - - runner.sh - - "./scripts/ci-e2e.sh" - env: - - name: ALWAYS_BUILD_KIND_IMAGES - value: "true" - - name: KUBERNETES_VERSION_UPGRADE_FROM - value: "stable-1.22" - - name: KUBERNETES_VERSION_UPGRADE_TO - value: "stable-1.23" - - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" - - name: COREDNS_VERSION_UPGRADE_TO - value: "v1.8.6" - - name: GINKGO_FOCUS - value: "\\[K8s-Upgrade\\]" - # we need privileged mode in order to do docker in docker - securityContext: - privileged: true - resources: - requests: - cpu: 7300m - annotations: - testgrid-dashboards: sig-cluster-lifecycle-cluster-api - testgrid-tab-name: capi-e2e-main-1-22-1-23 - testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io - testgrid-num-failures-to-alert: "4" - - name: periodic-cluster-api-e2e-workload-upgrade-1-23-1-24-main interval: 24h decorate: true @@ -265,7 +212,7 @@ periodics: testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io testgrid-num-failures-to-alert: "4" -- name: periodic-cluster-api-e2e-workload-upgrade-1-27-latest-main +- name: periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-main interval: 24h decorate: true decoration_config: @@ -299,9 +246,62 @@ periodics: - name: KUBERNETES_VERSION_UPGRADE_FROM value: "stable-1.27" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.28" + value: "stable-1.28" + - name: ETCD_VERSION_UPGRADE_TO + value: "3.5.9-0" + - name: COREDNS_VERSION_UPGRADE_TO + value: "v1.10.1" + - name: GINKGO_FOCUS + value: "\\[K8s-Upgrade\\]" + # we need privileged mode in order to do docker in docker + securityContext: + privileged: true + resources: + requests: + cpu: 7300m + annotations: + testgrid-dashboards: sig-cluster-lifecycle-cluster-api + testgrid-tab-name: capi-e2e-main-1-27-1-28 + testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io + testgrid-num-failures-to-alert: "4" + +- name: periodic-cluster-api-e2e-workload-upgrade-1-28-latest-main + interval: 24h + decorate: true + decoration_config: + gcs_credentials_secret: "" # Use workload identity for uploading artifacts + rerun_auth_config: + github_team_slugs: + - org: kubernetes-sigs + slug: cluster-api-maintainers + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api + base_ref: main + path_alias: sigs.k8s.io/cluster-api + - org: kubernetes + repo: kubernetes + base_ref: master + path_alias: k8s.io/kubernetes + spec: + serviceAccountName: prowjob-default-sa + containers: + - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-1.27 + args: + - runner.sh + - "./scripts/ci-e2e.sh" + env: + - name: ALWAYS_BUILD_KIND_IMAGES + value: "true" + - name: KUBERNETES_VERSION_UPGRADE_FROM + value: "stable-1.28" + - name: KUBERNETES_VERSION_UPGRADE_TO + value: "ci/latest-1.29" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.7-0" + value: "3.5.9-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.10.1" - name: GINKGO_FOCUS 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 index 4f13388d8e7b..085fa5dd7728 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml @@ -58,7 +58,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.24.2" + value: "1.25.0" resources: requests: cpu: 7300m @@ -187,8 +187,10 @@ periodics: value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]|\\[Scale\\]" # This value determines the minimum Kubernetes # supported version for Cluster API management cluster. + # Please also make sure to refer a version where a kindest/node image exists + # for (see https://github.com/kubernetes-sigs/kind/releases/tag) - name: KUBERNETES_VERSION_MANAGEMENT - value: "v1.24.15" + value: "v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8" # 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-periodics-release-1-5-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-5-upgrades.yaml index 250b08f8def8..1871292423c1 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-5-upgrades.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-5-upgrades.yaml @@ -265,7 +265,7 @@ periodics: testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io testgrid-num-failures-to-alert: "4" -- name: periodic-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-5 +- name: periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-release-1-5 interval: 24h decorate: true decoration_config: @@ -299,9 +299,9 @@ periodics: - name: KUBERNETES_VERSION_UPGRADE_FROM value: "stable-1.27" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.28" + value: "stable-1.28" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.7-0" + value: "3.5.9-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.10.1" - name: GINKGO_FOCUS @@ -314,6 +314,6 @@ periodics: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5 - testgrid-tab-name: capi-e2e-release-1-5-1-27-latest + testgrid-tab-name: capi-e2e-release-1-5-1-27-1-28 testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io testgrid-num-failures-to-alert: "4" 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 index 410a9fadb91c..61f5c894ba09 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml @@ -113,7 +113,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.24.2" + value: "1.25.0" resources: requests: cpu: 7300m @@ -294,7 +294,7 @@ presubmits: annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api testgrid-tab-name: capi-pr-e2e-full-main - - name: pull-cluster-api-e2e-workload-upgrade-1-27-latest-main + - name: pull-cluster-api-e2e-workload-upgrade-1-28-latest-main labels: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" @@ -323,11 +323,11 @@ presubmits: - name: ALWAYS_BUILD_KIND_IMAGES value: "true" - name: KUBERNETES_VERSION_UPGRADE_FROM - value: "stable-1.27" + value: "stable-1.28" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.28" + value: "ci/latest-1.29" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.7-0" + value: "3.5.9-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.10.1" - name: GINKGO_FOCUS @@ -340,7 +340,7 @@ presubmits: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api - testgrid-tab-name: capi-pr-e2e-main-1-27-latest + testgrid-tab-name: capi-pr-e2e-main-1-28-latest # This job is experimental for now. Please do not duplicate it to release branches. - name: pull-cluster-api-e2e-scale-main-experimental labels: diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-5.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-5.yaml index 0d575bd20a1d..2b7e5a5a2d52 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-5.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-5.yaml @@ -294,7 +294,7 @@ presubmits: annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5 testgrid-tab-name: capi-pr-e2e-full-release-1-5 - - name: pull-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-5 + - name: pull-cluster-api-e2e-workload-upgrade-1-27-1-28-release-1-5 labels: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" @@ -325,9 +325,9 @@ presubmits: - name: KUBERNETES_VERSION_UPGRADE_FROM value: "stable-1.27" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.28" + value: "stable-1.28" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.7-0" + value: "3.5.9-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.10.1" - name: GINKGO_FOCUS @@ -340,7 +340,7 @@ presubmits: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5 - testgrid-tab-name: capi-pr-e2e-release-1-5-1-27-latest + testgrid-tab-name: capi-pr-e2e-release-1-5-1-27-1-28 # This job is experimental for now. Please do not duplicate it to release branches. - name: pull-cluster-api-e2e-scale-release-1-5-experimental labels: