Cluster API: adjust jobs to new support policy

config/jobs/kubernetes-sigs/cluster-api/OWNERS

@@ -5,6 +5,7 @@ reviewers:
 - davidewatson
 - detiber
 - fabriziopandini
+- killianmuldoon
 - JoelSpeed
 - justinsb
 - sbueringer
@@ -15,6 +16,7 @@ approvers:
 - davidewatson
 - detiber
 - fabriziopandini
+- killianmuldoon
 - justinsb
 - sbueringer
 - timothysc

config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml

@@ -1,146 +1,5 @@
 periodics:
 
-- name: periodic-cluster-api-e2e-workload-upgrade-1-18-1-19-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:v20230207-192d5afee3-1.26
-      args:
-        - runner.sh
-        - "./scripts/ci-e2e.sh"
-      env:
-        - name: KUBERNETES_VERSION_UPGRADE_FROM
-          value: "stable-1.18"
-        - name: KUBERNETES_VERSION_UPGRADE_TO
-          value: "stable-1.19"
-        - name: ETCD_VERSION_UPGRADE_TO
-          value: "3.4.13-0"
-        - name: COREDNS_VERSION_UPGRADE_TO
-          value: "1.7.0"
-        - 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-18-1-19
-    testgrid-alert-email: [email protected]
-    testgrid-num-failures-to-alert: "4"
-
-- name: periodic-cluster-api-e2e-workload-upgrade-1-19-1-20-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:v20230207-192d5afee3-1.26
-      args:
-        - runner.sh
-        - "./scripts/ci-e2e.sh"
-      env:
-        - name: KUBERNETES_VERSION_UPGRADE_FROM
-          value: "stable-1.19"
-        - name: KUBERNETES_VERSION_UPGRADE_TO
-          value: "stable-1.20"
-        - name: ETCD_VERSION_UPGRADE_TO
-          value: "3.4.13-0"
-        - name: COREDNS_VERSION_UPGRADE_TO
-          value: "1.7.0"
-        - 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-19-1-20
-    testgrid-alert-email: [email protected]
-    testgrid-num-failures-to-alert: "4"
-
-- name: periodic-cluster-api-e2e-workload-upgrade-1-20-1-21-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:v20230207-192d5afee3-1.26
-      args:
-        - runner.sh
-        - "./scripts/ci-e2e.sh"
-      env:
-        - name: KUBERNETES_VERSION_UPGRADE_FROM
-          value: "stable-1.20"
-        - name: KUBERNETES_VERSION_UPGRADE_TO
-          value: "stable-1.21"
-        - name: ETCD_VERSION_UPGRADE_TO
-          value: "3.4.13-0"
-        - name: COREDNS_VERSION_UPGRADE_TO
-          value: "v1.8.0"
-        - 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-20-1-21
-    testgrid-alert-email: [email protected]
-    testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-workload-upgrade-1-21-1-22-main
   interval: 24h
   decorate: true

config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml

@@ -48,7 +48,7 @@ periodics:
       # To check the available envtest in Kubebuilder, please
       # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
       - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
-        value: "1.20.2"
+        value: "1.23.5"
       resources:
         requests:
           cpu: 7300m
@@ -121,14 +121,11 @@ periodics:
       - "./scripts/ci-e2e.sh"
       env:
       - name: GINKGO_SKIP
-        value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]|\\[ClusterClass\\]"
+        value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster.
       - name: KUBERNETES_VERSION_MANAGEMENT
-        value: "stable-1.20"
-      # CAPI does not work with v1.20 if ClusterClass is enabled, so we have to disable it.
-      - name: CLUSTER_TOPOLOGY
-        value: "false"
+        value: "stable-1.23"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true

config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-3-upgrades.yaml

@@ -375,50 +375,3 @@ periodics:
     testgrid-tab-name: capi-e2e-release-1-3-1-25-1-26
     testgrid-alert-email: [email protected]
     testgrid-num-failures-to-alert: "4"
-
-- name: periodic-cluster-api-e2e-workload-upgrade-1-26-latest-release-1-3
-  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.3
-    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:v20230207-192d5afee3-1.25
-      args:
-      - runner.sh
-      - "./scripts/ci-e2e.sh"
-      env:
-      - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.26"
-      - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "ci/latest-1.27"
-      - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.6-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.3
-    testgrid-tab-name: capi-e2e-release-1-3-1-26-latest
-    testgrid-alert-email: [email protected]
-    testgrid-num-failures-to-alert: "4"