Skip to content

Commit 8131796

Browse files
authored
Merge pull request #29743 from furkatgofurov7/move-operator-jobs-to-eksprow-cluster
CAPI Operator: move jobs to EKS prow cluster
2 parents 13eff70 + 19ae37f commit 8131796

File tree

4 files changed

+136
-8
lines changed

4 files changed

+136
-8
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
periodics:
22
- name: periodic-cluster-api-operator-test-main
3+
cluster: eks-prow-build-cluster
34
interval: 24h
45
decorate: true
56
labels:
@@ -14,12 +15,20 @@ periodics:
1415
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
1516
command:
1617
- "./scripts/ci-test.sh"
18+
resources:
19+
requests:
20+
cpu: "1"
21+
memory: "2Gi"
22+
limits:
23+
cpu: "1"
24+
memory: "2Gi"
1725
annotations:
1826
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
1927
testgrid-tab-name: capi-operator-test-main
2028
testgrid-alert-email: [email protected]
2129
testgrid-num-failures-to-alert: "2"
2230
- name: periodic-cluster-api-operator-e2e-main
31+
cluster: eks-prow-build-cluster
2332
interval: 24h
2433
decorate: true
2534
decoration_config:
@@ -41,6 +50,13 @@ periodics:
4150
# we need privileged mode in order to do docker in docker
4251
securityContext:
4352
privileged: true
53+
resources:
54+
requests:
55+
cpu: "1"
56+
memory: "2Gi"
57+
limits:
58+
cpu: "1"
59+
memory: "2Gi"
4460
annotations:
4561
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
4662
testgrid-tab-name: capi-operator-e2e-main

config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-periodics-release-0-3.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
periodics:
22
- name: periodic-cluster-api-operator-test-release-0-3
3+
cluster: eks-prow-build-cluster
34
interval: 24h
45
decorate: true
56
labels:
@@ -14,12 +15,20 @@ periodics:
1415
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
1516
command:
1617
- "./scripts/ci-test.sh"
18+
resources:
19+
requests:
20+
cpu: "1"
21+
memory: "2Gi"
22+
limits:
23+
cpu: "1"
24+
memory: "2Gi"
1725
annotations:
1826
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
1927
testgrid-tab-name: capi-operator-test-release-0-3
2028
testgrid-alert-email: [email protected]
2129
testgrid-num-failures-to-alert: "2"
2230
- name: periodic-cluster-api-operator-e2e-release-0-3
31+
cluster: eks-prow-build-cluster
2332
interval: 24h
2433
decorate: true
2534
decoration_config:
@@ -41,6 +50,13 @@ periodics:
4150
# we need privileged mode in order to do docker in docker
4251
securityContext:
4352
privileged: true
53+
resources:
54+
requests:
55+
cpu: "1"
56+
memory: "2Gi"
57+
limits:
58+
cpu: "1"
59+
memory: "2Gi"
4460
annotations:
4561
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
4662
testgrid-tab-name: capi-operator-e2e-release-0-3

config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
presubmits:
22
kubernetes-sigs/cluster-api-operator:
33
- name: pull-cluster-api-operator-build-main
4+
cluster: eks-prow-build-cluster
45
decorate: true
56
path_alias: sigs.k8s.io/cluster-api-operator
67
always_run: true
@@ -15,10 +16,18 @@ presubmits:
1516
command:
1617
- runner.sh
1718
- ./scripts/ci-build.sh
19+
resources:
20+
requests:
21+
cpu: "1"
22+
memory: "2Gi"
23+
limits:
24+
cpu: "1"
25+
memory: "2Gi"
1826
annotations:
1927
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
2028
testgrid-tab-name: capi-operator-pr-build-main
2129
- name: pull-cluster-api-operator-make-main
30+
cluster: eks-prow-build-cluster
2231
decorate: true
2332
path_alias: sigs.k8s.io/cluster-api-operator
2433
always_run: true
@@ -30,17 +39,25 @@ presubmits:
3039
- ^main$
3140
spec:
3241
containers:
33-
- command:
42+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
43+
command:
3444
- runner.sh
3545
- ./scripts/ci-make.sh
3646
# docker-in-docker needs privileged mode
3747
securityContext:
3848
privileged: true
39-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
49+
resources:
50+
requests:
51+
cpu: "1"
52+
memory: "2Gi"
53+
limits:
54+
cpu: "1"
55+
memory: "2Gi"
4056
annotations:
4157
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
4258
testgrid-tab-name: capi-operator-pr-make-main
4359
- name: pull-cluster-api-operator-apidiff-main
60+
cluster: eks-prow-build-cluster
4461
decorate: true
4562
path_alias: sigs.k8s.io/cluster-api-operator
4663
always_run: true
@@ -52,14 +69,22 @@ presubmits:
5269
- ^main$
5370
spec:
5471
containers:
55-
- command:
72+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
73+
command:
5674
- runner.sh
5775
- ./scripts/ci-apidiff.sh
58-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
76+
resources:
77+
requests:
78+
cpu: "1"
79+
memory: "2Gi"
80+
limits:
81+
cpu: "1"
82+
memory: "2Gi"
5983
annotations:
6084
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
6185
testgrid-tab-name: capi-operator-pr-apidiff-main
6286
- name: pull-cluster-api-operator-verify-main
87+
cluster: eks-prow-build-cluster
6388
decorate: true
6489
path_alias: sigs.k8s.io/cluster-api-operator
6590
always_run: true
@@ -74,10 +99,18 @@ presubmits:
7499
command:
75100
- "runner.sh"
76101
- ./scripts/ci-verify.sh
102+
resources:
103+
requests:
104+
cpu: "1"
105+
memory: "2Gi"
106+
limits:
107+
cpu: "1"
108+
memory: "2Gi"
77109
annotations:
78110
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
79111
testgrid-tab-name: capi-operator-pr-verify-main
80112
- name: pull-cluster-api-operator-test-main
113+
cluster: eks-prow-build-cluster
81114
decorate: true
82115
path_alias: sigs.k8s.io/cluster-api-operator
83116
always_run: true
@@ -92,10 +125,18 @@ presubmits:
92125
args:
93126
- runner.sh
94127
- ./scripts/ci-test.sh
128+
resources:
129+
requests:
130+
cpu: "1"
131+
memory: "2Gi"
132+
limits:
133+
cpu: "1"
134+
memory: "2Gi"
95135
annotations:
96136
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
97137
testgrid-tab-name: capi-operator-pr-test-main
98138
- name: pull-cluster-api-operator-e2e-main
139+
cluster: eks-prow-build-cluster
99140
path_alias: "sigs.k8s.io/cluster-api-operator"
100141
optional: false
101142
decorate: true
@@ -123,6 +164,13 @@ presubmits:
123164
secretKeyRef:
124165
name: cluster-lifecycle-github-token
125166
key: cluster-lifecycle-github-token
167+
resources:
168+
requests:
169+
cpu: "1"
170+
memory: "2Gi"
171+
limits:
172+
cpu: "1"
173+
memory: "2Gi"
126174
annotations:
127175
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator
128176
testgrid-tab-name: capi-operator-pr-e2e-main

config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
presubmits:
22
kubernetes-sigs/cluster-api-operator:
33
- name: pull-cluster-api-operator-build-release-0-3
4+
cluster: eks-prow-build-cluster
45
decorate: true
56
path_alias: sigs.k8s.io/cluster-api-operator
67
always_run: true
@@ -15,10 +16,18 @@ presubmits:
1516
command:
1617
- runner.sh
1718
- ./scripts/ci-build.sh
19+
resources:
20+
requests:
21+
cpu: "1"
22+
memory: "2Gi"
23+
limits:
24+
cpu: "1"
25+
memory: "2Gi"
1826
annotations:
1927
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
2028
testgrid-tab-name: capi-operator-pr-build-release-0-3
2129
- name: pull-cluster-api-operator-make-release-0-3
30+
cluster: eks-prow-build-cluster
2231
decorate: true
2332
path_alias: sigs.k8s.io/cluster-api-operator
2433
always_run: true
@@ -30,17 +39,25 @@ presubmits:
3039
- ^release-0.3$
3140
spec:
3241
containers:
33-
- command:
42+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
43+
command:
3444
- runner.sh
3545
- ./scripts/ci-make.sh
3646
# docker-in-docker needs privileged mode
3747
securityContext:
3848
privileged: true
39-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
49+
resources:
50+
requests:
51+
cpu: "1"
52+
memory: "2Gi"
53+
limits:
54+
cpu: "1"
55+
memory: "2Gi"
4056
annotations:
4157
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
4258
testgrid-tab-name: capi-operator-pr-make-release-0-3
4359
- name: pull-cluster-api-operator-apidiff-release-0-3
60+
cluster: eks-prow-build-cluster
4461
decorate: true
4562
path_alias: sigs.k8s.io/cluster-api-operator
4663
always_run: true
@@ -52,14 +69,22 @@ presubmits:
5269
- ^release-0.3$
5370
spec:
5471
containers:
55-
- command:
72+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
73+
command:
5674
- runner.sh
5775
- ./scripts/ci-apidiff.sh
58-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
76+
resources:
77+
requests:
78+
cpu: "1"
79+
memory: "2Gi"
80+
limits:
81+
cpu: "1"
82+
memory: "2Gi"
5983
annotations:
6084
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
6185
testgrid-tab-name: capi-operator-pr-apidiff-release-0-3
6286
- name: pull-cluster-api-operator-verify-release-0-3
87+
cluster: eks-prow-build-cluster
6388
decorate: true
6489
path_alias: sigs.k8s.io/cluster-api-operator
6590
always_run: true
@@ -74,10 +99,18 @@ presubmits:
7499
command:
75100
- "runner.sh"
76101
- ./scripts/ci-verify.sh
102+
resources:
103+
requests:
104+
cpu: "1"
105+
memory: "2Gi"
106+
limits:
107+
cpu: "1"
108+
memory: "2Gi"
77109
annotations:
78110
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
79111
testgrid-tab-name: capi-operator-pr-verify-release-0-3
80112
- name: pull-cluster-api-operator-test-release-0-3
113+
cluster: eks-prow-build-cluster
81114
decorate: true
82115
path_alias: sigs.k8s.io/cluster-api-operator
83116
always_run: true
@@ -92,10 +125,18 @@ presubmits:
92125
args:
93126
- runner.sh
94127
- ./scripts/ci-test.sh
128+
resources:
129+
requests:
130+
cpu: "1"
131+
memory: "2Gi"
132+
limits:
133+
cpu: "1"
134+
memory: "2Gi"
95135
annotations:
96136
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
97137
testgrid-tab-name: capi-operator-pr-test-release-0-3
98138
- name: pull-cluster-api-operator-e2e-release-0-3
139+
cluster: eks-prow-build-cluster
99140
path_alias: "sigs.k8s.io/cluster-api-operator"
100141
optional: false
101142
decorate: true
@@ -123,6 +164,13 @@ presubmits:
123164
secretKeyRef:
124165
name: cluster-lifecycle-github-token
125166
key: cluster-lifecycle-github-token
167+
resources:
168+
requests:
169+
cpu: "1"
170+
memory: "2Gi"
171+
limits:
172+
cpu: "1"
173+
memory: "2Gi"
126174
annotations:
127175
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-operator-0.3
128176
testgrid-tab-name: capi-operator-pr-e2e-release-0-3

0 commit comments

Comments
 (0)