Skip to content

Commit 0cafddb

Browse files
sbueringersbueringer
committed
Cluster API: adjust jobs to new support policy
1 parent afa8863 commit 0cafddb

File tree

4 files changed

+5
-194
lines changed

4 files changed

+5
-194
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ reviewers:
55
- davidewatson
66
- detiber
77
- fabriziopandini
8+
- killianmuldoon
89
- JoelSpeed
910
- justinsb
1011
- sbueringer
@@ -15,6 +16,7 @@ approvers:
1516
- davidewatson
1617
- detiber
1718
- fabriziopandini
19+
- killianmuldoon
1820
- justinsb
1921
- sbueringer
2022
- timothysc

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

Lines changed: 0 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,5 @@
11
periodics:
22

3-
- name: periodic-cluster-api-e2e-workload-upgrade-1-18-1-19-main
4-
interval: 24h
5-
decorate: true
6-
decoration_config:
7-
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
8-
labels:
9-
preset-dind-enabled: "true"
10-
preset-kind-volume-mounts: "true"
11-
extra_refs:
12-
- org: kubernetes-sigs
13-
repo: cluster-api
14-
base_ref: main
15-
path_alias: sigs.k8s.io/cluster-api
16-
- org: kubernetes
17-
repo: kubernetes
18-
base_ref: master
19-
path_alias: k8s.io/kubernetes
20-
spec:
21-
serviceAccountName: prowjob-default-sa
22-
containers:
23-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230207-192d5afee3-1.26
24-
args:
25-
- runner.sh
26-
- "./scripts/ci-e2e.sh"
27-
env:
28-
- name: KUBERNETES_VERSION_UPGRADE_FROM
29-
value: "stable-1.18"
30-
- name: KUBERNETES_VERSION_UPGRADE_TO
31-
value: "stable-1.19"
32-
- name: ETCD_VERSION_UPGRADE_TO
33-
value: "3.4.13-0"
34-
- name: COREDNS_VERSION_UPGRADE_TO
35-
value: "1.7.0"
36-
- name: GINKGO_FOCUS
37-
value: "\\[K8s-Upgrade\\]"
38-
# we need privileged mode in order to do docker in docker
39-
securityContext:
40-
privileged: true
41-
resources:
42-
requests:
43-
cpu: 7300m
44-
annotations:
45-
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
46-
testgrid-tab-name: capi-e2e-main-1-18-1-19
47-
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
48-
testgrid-num-failures-to-alert: "4"
49-
50-
- name: periodic-cluster-api-e2e-workload-upgrade-1-19-1-20-main
51-
interval: 24h
52-
decorate: true
53-
decoration_config:
54-
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
55-
labels:
56-
preset-dind-enabled: "true"
57-
preset-kind-volume-mounts: "true"
58-
extra_refs:
59-
- org: kubernetes-sigs
60-
repo: cluster-api
61-
base_ref: main
62-
path_alias: sigs.k8s.io/cluster-api
63-
- org: kubernetes
64-
repo: kubernetes
65-
base_ref: master
66-
path_alias: k8s.io/kubernetes
67-
spec:
68-
serviceAccountName: prowjob-default-sa
69-
containers:
70-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230207-192d5afee3-1.26
71-
args:
72-
- runner.sh
73-
- "./scripts/ci-e2e.sh"
74-
env:
75-
- name: KUBERNETES_VERSION_UPGRADE_FROM
76-
value: "stable-1.19"
77-
- name: KUBERNETES_VERSION_UPGRADE_TO
78-
value: "stable-1.20"
79-
- name: ETCD_VERSION_UPGRADE_TO
80-
value: "3.4.13-0"
81-
- name: COREDNS_VERSION_UPGRADE_TO
82-
value: "1.7.0"
83-
- name: GINKGO_FOCUS
84-
value: "\\[K8s-Upgrade\\]"
85-
# we need privileged mode in order to do docker in docker
86-
securityContext:
87-
privileged: true
88-
resources:
89-
requests:
90-
cpu: 7300m
91-
annotations:
92-
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
93-
testgrid-tab-name: capi-e2e-main-1-19-1-20
94-
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
95-
testgrid-num-failures-to-alert: "4"
96-
97-
- name: periodic-cluster-api-e2e-workload-upgrade-1-20-1-21-main
98-
interval: 24h
99-
decorate: true
100-
decoration_config:
101-
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
102-
labels:
103-
preset-dind-enabled: "true"
104-
preset-kind-volume-mounts: "true"
105-
extra_refs:
106-
- org: kubernetes-sigs
107-
repo: cluster-api
108-
base_ref: main
109-
path_alias: sigs.k8s.io/cluster-api
110-
- org: kubernetes
111-
repo: kubernetes
112-
base_ref: master
113-
path_alias: k8s.io/kubernetes
114-
spec:
115-
serviceAccountName: prowjob-default-sa
116-
containers:
117-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230207-192d5afee3-1.26
118-
args:
119-
- runner.sh
120-
- "./scripts/ci-e2e.sh"
121-
env:
122-
- name: KUBERNETES_VERSION_UPGRADE_FROM
123-
value: "stable-1.20"
124-
- name: KUBERNETES_VERSION_UPGRADE_TO
125-
value: "stable-1.21"
126-
- name: ETCD_VERSION_UPGRADE_TO
127-
value: "3.4.13-0"
128-
- name: COREDNS_VERSION_UPGRADE_TO
129-
value: "v1.8.0"
130-
- name: GINKGO_FOCUS
131-
value: "\\[K8s-Upgrade\\]"
132-
# we need privileged mode in order to do docker in docker
133-
securityContext:
134-
privileged: true
135-
resources:
136-
requests:
137-
cpu: 7300m
138-
annotations:
139-
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
140-
testgrid-tab-name: capi-e2e-main-1-20-1-21
141-
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
142-
testgrid-num-failures-to-alert: "4"
143-
1443
- name: periodic-cluster-api-e2e-workload-upgrade-1-21-1-22-main
1454
interval: 24h
1465
decorate: true

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ periodics:
4848
# To check the available envtest in Kubebuilder, please
4949
# refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
5050
- name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
51-
value: "1.20.2"
51+
value: "1.23.5"
5252
resources:
5353
requests:
5454
cpu: 7300m
@@ -121,14 +121,11 @@ periodics:
121121
- "./scripts/ci-e2e.sh"
122122
env:
123123
- name: GINKGO_SKIP
124-
value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]|\\[ClusterClass\\]"
124+
value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]"
125125
# This value determines the minimum Kubernetes
126126
# supported version for Cluster API management cluster.
127127
- name: KUBERNETES_VERSION_MANAGEMENT
128-
value: "stable-1.20"
129-
# CAPI does not work with v1.20 if ClusterClass is enabled, so we have to disable it.
130-
- name: CLUSTER_TOPOLOGY
131-
value: "false"
128+
value: "stable-1.23"
132129
# we need privileged mode in order to do docker in docker
133130
securityContext:
134131
privileged: true

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

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -375,50 +375,3 @@ periodics:
375375
testgrid-tab-name: capi-e2e-release-1-3-1-25-1-26
376376
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
377377
testgrid-num-failures-to-alert: "4"
378-
379-
- name: periodic-cluster-api-e2e-workload-upgrade-1-26-latest-release-1-3
380-
interval: 24h
381-
decorate: true
382-
decoration_config:
383-
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
384-
labels:
385-
preset-dind-enabled: "true"
386-
preset-kind-volume-mounts: "true"
387-
extra_refs:
388-
- org: kubernetes-sigs
389-
repo: cluster-api
390-
base_ref: release-1.3
391-
path_alias: sigs.k8s.io/cluster-api
392-
- org: kubernetes
393-
repo: kubernetes
394-
base_ref: master
395-
path_alias: k8s.io/kubernetes
396-
spec:
397-
serviceAccountName: prowjob-default-sa
398-
containers:
399-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230207-192d5afee3-1.25
400-
args:
401-
- runner.sh
402-
- "./scripts/ci-e2e.sh"
403-
env:
404-
- name: KUBERNETES_VERSION_UPGRADE_FROM
405-
value: "stable-1.26"
406-
- name: KUBERNETES_VERSION_UPGRADE_TO
407-
value: "ci/latest-1.27"
408-
- name: ETCD_VERSION_UPGRADE_TO
409-
value: "3.5.6-0"
410-
- name: COREDNS_VERSION_UPGRADE_TO
411-
value: "v1.9.3"
412-
- name: GINKGO_FOCUS
413-
value: "\\[K8s-Upgrade\\]"
414-
# we need privileged mode in order to do docker in docker
415-
securityContext:
416-
privileged: true
417-
resources:
418-
requests:
419-
cpu: 7300m
420-
annotations:
421-
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.3
422-
testgrid-tab-name: capi-e2e-release-1-3-1-26-latest
423-
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
424-
testgrid-num-failures-to-alert: "4"

0 commit comments

Comments
 (0)