From 5fe739cdc913fd803e70dd9f93f2d8a6b6f0533f Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Wed, 25 Sep 2024 13:12:42 +0100 Subject: [PATCH] update tested k8s versions to roughly match latest supported releases See https://github.com/cert-manager/website/pull/1563 for the latest changes. Signed-off-by: Ashley Davis --- .../master/cert-manager-master.yaml | 303 +++++------------- config/prowgen/prowspecs/specs.go | 13 +- 2 files changed, 83 insertions(+), 233 deletions(-) diff --git a/config/jobs/cert-manager/cert-manager/master/cert-manager-master.yaml b/config/jobs/cert-manager/cert-manager/master/cert-manager-master.yaml index 0eeb5e66..22363e41 100644 --- a/config/jobs/cert-manager/cert-manager/master/cert-manager-master.yaml +++ b/config/jobs/cert-manager/cert-manager/master/cert-manager-master.yaml @@ -70,62 +70,11 @@ presubmits: - master always_run: true optional: false - - name: pull-cert-manager-master-e2e-v1-25 - max_concurrency: 4 - decorate: true - annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.25 cluster - testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com - testgrid-create-job-group: "true" - testgrid-dashboards: cert-manager-presubmits-master - labels: - preset-cloudflare-credentials: "true" - preset-dind-enabled: "true" - preset-enable-all-feature-gates: "true" - preset-ginkgo-skip-default: "true" - preset-go-cache: "true" - preset-local-cache: "true" - preset-retry-flakey-jobs: "true" - spec: - containers: - - image: europe-west1-docker.pkg.dev/cert-manager-tests-trusted/cert-manager-infra-images/make-dind:20240422-6b43e85-bookworm - args: - - runner - - make - - -j7 - - vendor-go - - e2e-ci - - K8S_VERSION=1.25 - resources: - requests: - cpu: 7000m - memory: 6Gi - securityContext: - privileged: true - capabilities: - add: - - SYS_ADMIN - lifecycle: - preStop: - exec: - command: - - /bin/sh - - -c - - make kind-logs - dnsPolicy: None - dnsConfig: - nameservers: - - 8.8.8.8 - - 8.8.4.4 - branches: - - master - always_run: false - optional: true - - name: pull-cert-manager-master-e2e-v1-26 + - name: pull-cert-manager-master-e2e-v1-27 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.26 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.27 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-presubmits-master @@ -146,7 +95,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.26 + - K8S_VERSION=1.27 resources: requests: cpu: 7000m @@ -172,11 +121,11 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-27 + - name: pull-cert-manager-master-e2e-v1-28 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.27 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.28 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-presubmits-master @@ -197,7 +146,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.27 + - K8S_VERSION=1.28 resources: requests: cpu: 7000m @@ -223,11 +172,11 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-28 + - name: pull-cert-manager-master-e2e-v1-29 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.28 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.29 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-presubmits-master @@ -248,7 +197,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.28 + - K8S_VERSION=1.29 resources: requests: cpu: 7000m @@ -274,11 +223,11 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-29 + - name: pull-cert-manager-master-e2e-v1-30 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.29 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.30 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-presubmits-master @@ -299,7 +248,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.29 + - K8S_VERSION=1.30 resources: requests: cpu: 7000m @@ -325,11 +274,11 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-30 + - name: pull-cert-manager-master-e2e-v1-31 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.30 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.31 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-presubmits-master @@ -350,7 +299,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -376,7 +325,7 @@ presubmits: - master always_run: true optional: false - - name: pull-cert-manager-master-e2e-v1-30-upgrade + - name: pull-cert-manager-master-e2e-v1-31-upgrade max_concurrency: 4 decorate: true annotations: @@ -394,7 +343,7 @@ presubmits: args: - runner - make - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 - vendor-go - test-upgrade resources: @@ -449,7 +398,7 @@ presubmits: always_run: false optional: true run_if_changed: go.mod - - name: pull-cert-manager-master-e2e-v1-30-issuers-venafi-tpp + - name: pull-cert-manager-master-e2e-v1-31-issuers-venafi-tpp max_concurrency: 4 decorate: true annotations: @@ -473,7 +422,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -499,7 +448,7 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-30-issuers-venafi-cloud + - name: pull-cert-manager-master-e2e-v1-31-issuers-venafi-cloud max_concurrency: 4 decorate: true annotations: @@ -523,7 +472,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -549,7 +498,7 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-30-feature-gates-disabled + - name: pull-cert-manager-master-e2e-v1-31-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -574,7 +523,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -600,7 +549,7 @@ presubmits: - master always_run: false optional: true - - name: pull-cert-manager-master-e2e-v1-30-bestpractice-install + - name: pull-cert-manager-master-e2e-v1-31-bestpractice-install max_concurrency: 4 decorate: true annotations: @@ -627,7 +576,7 @@ presubmits: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -688,63 +637,11 @@ periodics: repo: cert-manager base_ref: master cron: 00 00-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-25 - max_concurrency: 4 - decorate: true - annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.25 cluster - testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com - testgrid-create-job-group: "true" - testgrid-dashboards: cert-manager-periodics-master - labels: - preset-cloudflare-credentials: "true" - preset-dind-enabled: "true" - preset-enable-all-feature-gates: "true" - preset-ginkgo-skip-default: "true" - preset-go-cache: "true" - preset-local-cache: "true" - preset-retry-flakey-jobs: "true" - spec: - containers: - - image: europe-west1-docker.pkg.dev/cert-manager-tests-trusted/cert-manager-infra-images/make-dind:20240422-6b43e85-bookworm - args: - - runner - - make - - -j7 - - vendor-go - - e2e-ci - - K8S_VERSION=1.25 - resources: - requests: - cpu: 7000m - memory: 6Gi - securityContext: - privileged: true - capabilities: - add: - - SYS_ADMIN - lifecycle: - preStop: - exec: - command: - - /bin/sh - - -c - - make kind-logs - dnsPolicy: None - dnsConfig: - nameservers: - - 8.8.8.8 - - 8.8.4.4 - extra_refs: - - org: cert-manager - repo: cert-manager - base_ref: master - cron: 03 01-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-26 +- name: ci-cert-manager-master-e2e-v1-27 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.26 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.27 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-periodics-master @@ -765,7 +662,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.26 + - K8S_VERSION=1.27 resources: requests: cpu: 7000m @@ -791,12 +688,12 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 06 00-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-27 + cron: 04 01-23/02 * * * +- name: ci-cert-manager-master-e2e-v1-28 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.27 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.28 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-periodics-master @@ -817,7 +714,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.27 + - K8S_VERSION=1.28 resources: requests: cpu: 7000m @@ -843,12 +740,12 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 09 01-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-28 + cron: 08 00-23/02 * * * +- name: ci-cert-manager-master-e2e-v1-29 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.28 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.29 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-periodics-master @@ -869,7 +766,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.28 + - K8S_VERSION=1.29 resources: requests: cpu: 7000m @@ -895,12 +792,12 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 12 00-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-29 + cron: 12 01-23/02 * * * +- name: ci-cert-manager-master-e2e-v1-30 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.29 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.30 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-periodics-master @@ -921,7 +818,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.29 + - K8S_VERSION=1.30 resources: requests: cpu: 7000m @@ -947,12 +844,12 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 15 01-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-30 + cron: 16 00-23/02 * * * +- name: ci-cert-manager-master-e2e-v1-31 max_concurrency: 4 decorate: true annotations: - description: Runs the end-to-end test suite against a Kubernetes v1.30 cluster + description: Runs the end-to-end test suite against a Kubernetes v1.31 cluster testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com testgrid-create-job-group: "true" testgrid-dashboards: cert-manager-periodics-master @@ -973,7 +870,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -999,8 +896,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 18 00-23/02 * * * -- name: ci-cert-manager-master-e2e-v1-30-issuers-venafi + cron: 20 01-23/02 * * * +- name: ci-cert-manager-master-e2e-v1-31-issuers-venafi max_concurrency: 4 decorate: true annotations: @@ -1025,7 +922,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -1051,8 +948,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 21 00-23/12 * * * -- name: ci-cert-manager-master-e2e-v1-30-upgrade + cron: 24 00-23/12 * * * +- name: ci-cert-manager-master-e2e-v1-31-upgrade max_concurrency: 4 decorate: true annotations: @@ -1070,7 +967,7 @@ periodics: args: - runner - make - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 - vendor-go - test-upgrade resources: @@ -1091,8 +988,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 24 00-23/08 * * * -- name: ci-cert-manager-master-e2e-v1-30-bestpractice-install + cron: 28 00-23/08 * * * +- name: ci-cert-manager-master-e2e-v1-31-bestpractice-install max_concurrency: 4 decorate: true annotations: @@ -1119,59 +1016,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 - resources: - requests: - cpu: 7000m - memory: 6Gi - securityContext: - privileged: true - capabilities: - add: - - SYS_ADMIN - lifecycle: - preStop: - exec: - command: - - /bin/sh - - -c - - make kind-logs - dnsPolicy: None - dnsConfig: - nameservers: - - 8.8.8.8 - - 8.8.4.4 - extra_refs: - - org: cert-manager - repo: cert-manager - base_ref: master - cron: 27 00-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-25-feature-gates-disabled - max_concurrency: 4 - decorate: true - annotations: - description: Runs the E2E tests with all feature gates disabled - testgrid-alert-email: cert-manager-dev-alerts@googlegroups.com - testgrid-create-job-group: "true" - testgrid-dashboards: cert-manager-periodics-master - labels: - preset-cloudflare-credentials: "true" - preset-dind-enabled: "true" - preset-disable-all-alpha-beta-feature-gates: "true" - preset-ginkgo-skip-default: "true" - preset-go-cache: "true" - preset-local-cache: "true" - preset-retry-flakey-jobs: "true" - spec: - containers: - - image: europe-west1-docker.pkg.dev/cert-manager-tests-trusted/cert-manager-infra-images/make-dind:20240422-6b43e85-bookworm - args: - - runner - - make - - -j7 - - vendor-go - - e2e-ci - - K8S_VERSION=1.25 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -1197,8 +1042,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 30 07-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-26-feature-gates-disabled + cron: 32 00-23/24 * * * +- name: ci-cert-manager-master-e2e-v1-27-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -1223,7 +1068,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.26 + - K8S_VERSION=1.27 resources: requests: cpu: 7000m @@ -1249,8 +1094,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 33 14-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-27-feature-gates-disabled + cron: 36 07-23/24 * * * +- name: ci-cert-manager-master-e2e-v1-28-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -1275,7 +1120,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.27 + - K8S_VERSION=1.28 resources: requests: cpu: 7000m @@ -1301,8 +1146,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 36 21-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-28-feature-gates-disabled + cron: 40 14-23/24 * * * +- name: ci-cert-manager-master-e2e-v1-29-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -1327,7 +1172,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.28 + - K8S_VERSION=1.29 resources: requests: cpu: 7000m @@ -1353,8 +1198,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 39 04-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-29-feature-gates-disabled + cron: 44 21-23/24 * * * +- name: ci-cert-manager-master-e2e-v1-30-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -1379,7 +1224,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.29 + - K8S_VERSION=1.30 resources: requests: cpu: 7000m @@ -1405,8 +1250,8 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 42 11-23/24 * * * -- name: ci-cert-manager-master-e2e-v1-30-feature-gates-disabled + cron: 48 04-23/24 * * * +- name: ci-cert-manager-master-e2e-v1-31-feature-gates-disabled max_concurrency: 4 decorate: true annotations: @@ -1431,7 +1276,7 @@ periodics: - -j7 - vendor-go - e2e-ci - - K8S_VERSION=1.30 + - K8S_VERSION=1.31 resources: requests: cpu: 7000m @@ -1457,7 +1302,7 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 45 18-23/24 * * * + cron: 52 11-23/24 * * * - name: ci-cert-manager-master-trivy-test-controller max_concurrency: 2 decorate: true @@ -1496,7 +1341,7 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 48 01-23/24 * * * + cron: 56 18-23/24 * * * - name: ci-cert-manager-master-trivy-test-acmesolver max_concurrency: 2 decorate: true @@ -1535,7 +1380,7 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 51 08-23/24 * * * + cron: 00 01-23/24 * * * - name: ci-cert-manager-master-trivy-test-startupapicheck max_concurrency: 2 decorate: true @@ -1574,7 +1419,7 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 54 15-23/24 * * * + cron: 04 08-23/24 * * * - name: ci-cert-manager-master-trivy-test-cainjector max_concurrency: 2 decorate: true @@ -1613,7 +1458,7 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 57 22-23/24 * * * + cron: 08 15-23/24 * * * - name: ci-cert-manager-master-trivy-test-webhook max_concurrency: 2 decorate: true @@ -1652,4 +1497,4 @@ periodics: - org: cert-manager repo: cert-manager base_ref: master - cron: 00 05-23/24 * * * + cron: 12 22-23/24 * * * diff --git a/config/prowgen/prowspecs/specs.go b/config/prowgen/prowspecs/specs.go index e321a09e..f16e6fc3 100644 --- a/config/prowgen/prowspecs/specs.go +++ b/config/prowgen/prowspecs/specs.go @@ -49,7 +49,10 @@ var knownBranches map[string]BranchSpec = map[string]BranchSpec{ }, primaryKubernetesVersion: "1.27", - otherKubernetesVersions: []string{"1.22", "1.23", "1.24", "1.25", "1.26", "1.28", "1.29"}, + // NB: It would be nice to test 1.30 and 1.31 (and newer) here but newer versions of Kind don't + // build images to support testing older k8s versions. E.g. kind v0.24.0 doesn't have images for + // Kubernetes 1.24 and below + otherKubernetesVersions: []string{"1.22", "1.23", "1.24", "1.25", "1.26", "1.28", "1.29"}, e2eCPURequest: "7000m", e2eMemoryRequest: "6Gi", @@ -104,7 +107,9 @@ var knownBranches map[string]BranchSpec = map[string]BranchSpec{ }, primaryKubernetesVersion: "1.30", - otherKubernetesVersions: []string{"1.25", "1.26", "1.27", "1.28", "1.29"}, + + // TODO: test k8s 1.31 here when possible; requires support in the release-1.15 branch on cert-manager + otherKubernetesVersions: []string{"1.25", "1.26", "1.27", "1.28", "1.29"}, e2eCPURequest: "7000m", e2eMemoryRequest: "6Gi", @@ -123,8 +128,8 @@ var knownBranches map[string]BranchSpec = map[string]BranchSpec{ Repo: "cert-manager", }, - primaryKubernetesVersion: "1.30", - otherKubernetesVersions: []string{"1.25", "1.26", "1.27", "1.28", "1.29"}, + primaryKubernetesVersion: "1.31", + otherKubernetesVersions: []string{"1.27", "1.28", "1.29", "1.30"}, e2eCPURequest: "7000m", e2eMemoryRequest: "6Gi",