From f4256b98b4a9087cfd9ace04dda4bbe14ac01460 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 8 Sep 2022 14:07:40 +0200 Subject: [PATCH] Bump cluster-api jobs for v1.25/v1.26 --- .../cluster-api-periodics-main-upgrades.yaml | 55 +++++++++++++++++-- .../cluster-api-periodics-main.yaml | 4 +- ...er-api-periodics-release-1-2-upgrades.yaml | 55 +++++++++++++++++-- .../cluster-api-periodics-release-1-2.yaml | 4 +- .../cluster-api-presubmits-main.yaml | 55 ++----------------- .../cluster-api-presubmits-release-1-2.yaml | 10 ++-- 6 files changed, 116 insertions(+), 67 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 7592f60353ee..e54f6cfdabfa 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 @@ -282,7 +282,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-24-latest-main +- name: periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main interval: 24h decorate: true decoration_config: @@ -310,9 +310,9 @@ periodics: - name: KUBERNETES_VERSION_UPGRADE_FROM value: "stable-1.24" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.25" + value: "stable-1.25" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" + value: "3.5.4-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.9.3" - name: GINKGO_FOCUS @@ -325,6 +325,53 @@ periodics: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api - testgrid-tab-name: capi-e2e-main-1-24-latest + testgrid-tab-name: capi-e2e-main-1-24-1-25 + 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-25-latest-main + interval: 24h + decorate: true + decoration_config: + gcs_credentials_secret: "" # Use workload identity for uploading artifacts + 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:v20220903-da891f21aa-1.25 + args: + - runner.sh + - "./scripts/ci-e2e.sh" + env: + - name: KUBERNETES_VERSION_UPGRADE_FROM + value: "stable-1.25" + - name: KUBERNETES_VERSION_UPGRADE_TO + value: "ci/latest-1.26" + - name: ETCD_VERSION_UPGRADE_TO + value: "3.5.4-0" + - name: COREDNS_VERSION_UPGRADE_TO + value: "v1.9.3" + - 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-25-latest 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-periodics-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml index 75c1e93ad62d..5bbf06bc5756 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 @@ -130,11 +130,11 @@ periodics: - name: GINKGO_FOCUS value: "\\[clusterctl-Upgrade\\]" - name: INIT_WITH_BINARY - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH} + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/clusterctl-{OS}-{ARCH} - name: INIT_WITH_PROVIDERS_CONTRACT value: v1beta1 - name: INIT_WITH_KUBERNETES_VERSION - value: v1.24.0 + value: v1.25.0 # we need privileged mode in order to do docker in docker securityContext: diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2-upgrades.yaml index 06bcba6fb1c6..409aebea0cd1 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2-upgrades.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2-upgrades.yaml @@ -282,7 +282,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-24-latest-release-1-2 +- name: periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-release-1-2 interval: 24h decorate: true decoration_config: @@ -310,9 +310,9 @@ periodics: - name: KUBERNETES_VERSION_UPGRADE_FROM value: "stable-1.24" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.25" + value: "stable-1.25" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" + value: "3.5.4-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.9.3" - name: GINKGO_FOCUS @@ -325,6 +325,53 @@ periodics: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2 - testgrid-tab-name: capi-e2e-release-1-2-1-24-latest + testgrid-tab-name: capi-e2e-release-1-2-1-24-1-25 + 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-25-latest-release-1-2 + interval: 24h + decorate: true + decoration_config: + gcs_credentials_secret: "" # Use workload identity for uploading artifacts + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + extra_refs: + - org: kubernetes-sigs + repo: cluster-api + base_ref: release-1.2 + 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:v20220903-da891f21aa-1.24 + args: + - runner.sh + - "./scripts/ci-e2e.sh" + env: + - name: KUBERNETES_VERSION_UPGRADE_FROM + value: "stable-1.25" + - name: KUBERNETES_VERSION_UPGRADE_TO + value: "ci/latest-1.26" + - name: ETCD_VERSION_UPGRADE_TO + value: "3.5.4-0" + - name: COREDNS_VERSION_UPGRADE_TO + value: "v1.9.3" + - 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-1.2 + testgrid-tab-name: capi-e2e-release-1-2-1-25-latest 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-periodics-release-1-2.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2.yaml index 9f0b129d4d00..8cd38bb3a506 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2.yaml @@ -130,11 +130,11 @@ periodics: - name: GINKGO_FOCUS value: "\\[clusterctl-Upgrade\\]" - name: INIT_WITH_BINARY - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-{OS}-{ARCH} + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/clusterctl-{OS}-{ARCH} - name: INIT_WITH_PROVIDERS_CONTRACT value: v1beta1 - name: INIT_WITH_KUBERNETES_VERSION - value: v1.24.0 + value: v1.25.0 # we need privileged mode in order to do docker in docker securityContext: 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 1786a71669ab..9cd28db0b891 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 @@ -254,7 +254,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-24-latest-main + - name: pull-cluster-api-e2e-workload-upgrade-1-25-latest-main labels: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" @@ -281,11 +281,11 @@ presubmits: - "./scripts/ci-e2e.sh" env: - name: KUBERNETES_VERSION_UPGRADE_FROM - value: "stable-1.24" + value: "stable-1.25" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.25" + value: "ci/latest-1.26" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" + value: "3.5.4-0" - name: COREDNS_VERSION_UPGRADE_TO value: "v1.9.3" - name: GINKGO_FOCUS @@ -298,49 +298,4 @@ presubmits: cpu: 7300m annotations: testgrid-dashboards: sig-cluster-lifecycle-cluster-api - testgrid-tab-name: capi-pr-e2e-main-1-24-latest - - name: pull-cluster-api-e2e-workload-upgrade-1-21-1-22-main - labels: - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" - decorate: true - decoration_config: - gcs_credentials_secret: "" # Use workload identity for uploading artifacts - optional: true - always_run: false - branches: - # The script this job runs is not in all branches. - - ^main$ - path_alias: sigs.k8s.io/cluster-api - extra_refs: - - 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:v20220903-da891f21aa-1.25 - args: - - runner.sh - - "./scripts/ci-e2e.sh" - env: - - name: KUBERNETES_VERSION_UPGRADE_FROM - value: "stable-1.21" - - name: KUBERNETES_VERSION_UPGRADE_TO - value: "stable-1.22" - - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" - - name: COREDNS_VERSION_UPGRADE_TO - value: "v1.8.4" - - 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-pr-e2e-main-1-21-1-22 + testgrid-tab-name: capi-pr-e2e-main-1-25-latest 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 index 0f0fd98ccad4..3897937ceb85 100644 --- 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-24-latest-release-1-2 + - name: pull-cluster-api-e2e-workload-upgrade-1-25-latest-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.24" + value: "stable-1.25" - name: KUBERNETES_VERSION_UPGRADE_TO - value: "ci/latest-1.25" + value: "ci/latest-1.26" - name: ETCD_VERSION_UPGRADE_TO - value: "3.5.3-0" + value: "3.5.4-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-24-latest + testgrid-tab-name: capi-pr-e2e-release-1-2-1-25-latest