Skip to content

Commit b89eb08

Browse files
cpanatocpanato
committed
cleanup and organize a bit better kube-cross and gorunner deps
Signed-off-by: cpanato <[email protected]>
1 parent 0c495a7 commit b89eb08

File tree

1 file changed

+163
-69
lines changed

1 file changed

+163
-69
lines changed

‎dependencies.yaml

Lines changed: 163 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -150,96 +150,226 @@ dependencies:
150150
- path: images/releng/ci/variants.yaml
151151
match: REVISION:\ '\d+'
152152

153-
- name: "k8s.gcr.io/build-image/go-runner"
154-
version: v2.3.1-go1.17.13-bullseye.0
153+
# go-runner
154+
- name: "k8s.gcr.io/build-image/go-runner (go1.20-bullseye)"
155+
version: v2.3.1-go1.20-bullseye.0
155156
refPaths:
156157
- path: images/build/go-runner/variants.yaml
157158
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
158159

159-
- name: "k8s.gcr.io/build-image/go-runner: image revision"
160+
- name: "k8s.gcr.io/build-image/go-runner: image revision (go1.20-bullseye)"
160161
version: 0
161162
refPaths:
162163
- path: images/build/go-runner/Makefile
163164
match: REVISION \?= \d+
164165
- path: images/build/go-runner/variants.yaml
165166
match: REVISION:\ '\d+'
166167

167-
- name: "k8s.gcr.io/build-image/kube-cross"
168+
- name: "k8s.gcr.io/build-image/go-runner (go1.19-bullseye)"
169+
version: v2.3.1-go1.19.5-bullseye.0
170+
refPaths:
171+
- path: images/build/go-runner/variants.yaml
172+
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
173+
174+
- name: "k8s.gcr.io/build-image/go-runner: image revision (go1.19-bullseye)"
175+
version: 0
176+
refPaths:
177+
- path: images/build/go-runner/Makefile
178+
match: REVISION \?= \d+
179+
- path: images/build/go-runner/variants.yaml
180+
match: REVISION:\ '\d+'
181+
182+
- name: "k8s.gcr.io/build-image/go-runner (go1.18-bullseye)"
183+
version: v2.3.1-go1.18.10-bullseye.0
184+
refPaths:
185+
- path: images/build/go-runner/variants.yaml
186+
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
187+
188+
- name: "k8s.gcr.io/build-image/go-runner: image revision (go1.18-bullseye)"
189+
version: 0
190+
refPaths:
191+
- path: images/build/go-runner/Makefile
192+
match: REVISION \?= \d+
193+
- path: images/build/go-runner/variants.yaml
194+
match: REVISION:\ '\d+'
195+
196+
# kube-cross
197+
- name: "k8s.gcr.io/build-image/kube-cross (v1.27-go1.20)"
198+
version: v1.27.0-go1.20-bullseye.0
199+
refPaths:
200+
- path: images/build/cross/variants.yaml
201+
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
202+
203+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.27-go1.20)"
204+
version: go1.20-bullseye
205+
refPaths:
206+
- path: images/build/cross/variants.yaml
207+
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
208+
209+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.27-go1.20)"
210+
version: 0
211+
refPaths:
212+
- path: images/build/cross/Makefile
213+
match: REVISION \?= \d+
214+
- path: images/build/cross/variants.yaml
215+
match: REVISION:\ '\d+'
216+
217+
- name: "k8s.gcr.io/build-image/kube-cross (v1.26-go1.19)"
168218
version: v1.26.0-go1.19.5-bullseye.0
169219
refPaths:
170220
- path: images/build/cross/variants.yaml
171221
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
172222

173-
- name: "k8s.gcr.io/build-image/kube-cross: config variant"
223+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.26-go1.19)"
174224
version: go1.19-bullseye
175225
refPaths:
176226
- path: images/build/cross/variants.yaml
177227
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
178228

179-
- name: "k8s.gcr.io/build-image/kube-cross: image revision"
229+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.26-go1.19)"
180230
version: 0
181231
refPaths:
182232
- path: images/build/cross/Makefile
183233
match: REVISION \?= \d+
184234
- path: images/build/cross/variants.yaml
185235
match: REVISION:\ '\d+'
186236

187-
- name: "k8s.gcr.io/build-image/kube-cross: dependents bullseye"
188-
version: v1.26.0-go1.19.5-bullseye.0
237+
- name: "k8s.gcr.io/build-image/kube-cross (v1.25-go1.19)"
238+
version: v1.25.0-go1.19.5-bullseye.0
189239
refPaths:
190-
- path: images/k8s-cloud-builder/variants.yaml
191-
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
240+
- path: images/build/cross/variants.yaml
241+
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
192242

193-
# Golang (next candidate)
194-
- name: "golang (next candidate)"
195-
version: 1.20
243+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.25-go1.19)"
244+
version: go1.19-bullseye
196245
refPaths:
197246
- path: images/build/cross/variants.yaml
198-
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
199-
- path: images/build/go-runner/variants.yaml
200-
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
201-
- path: images/releng/ci/variants.yaml
202-
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
203-
- path: images/releng/k8s-ci-builder/variants.yaml
204-
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
247+
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
205248

206-
# Golang images (next candidate)
207-
- name: "gcr.io/k8s-staging-releng/releng-ci: image revision (next candidate)"
249+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.25-go1.19)"
208250
version: 0
209251
refPaths:
210-
- path: images/releng/ci/variants.yaml
252+
- path: images/build/cross/Makefile
253+
match: REVISION \?= \d+
254+
- path: images/build/cross/variants.yaml
211255
match: REVISION:\ '\d+'
212256

213-
- name: "k8s.gcr.io/build-image/go-runner (next candidate)"
214-
version: v2.3.1-go1.20-bullseye.0
257+
- name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.19)"
258+
version: v1.24.0-go1.19.5-bullseye.0
215259
refPaths:
216-
- path: images/build/go-runner/variants.yaml
260+
- path: images/build/cross/variants.yaml
217261
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
218262

219-
- name: "k8s.gcr.io/build-image/go-runner: image revision (next candidate)"
263+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.24-go1.19)"
264+
version: go1.19-bullseye
265+
refPaths:
266+
- path: images/build/cross/variants.yaml
267+
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
268+
269+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.19)"
220270
version: 0
221271
refPaths:
222-
- path: images/build/go-runner/variants.yaml
272+
- path: images/build/cross/Makefile
273+
match: REVISION \?= \d+
274+
- path: images/build/cross/variants.yaml
223275
match: REVISION:\ '\d+'
224276

225-
- name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
226-
version: v1.27.0-go1.20-bullseye.0
277+
- name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.18)"
278+
version: v1.24.0-go1.18.10-bullseye.0
227279
refPaths:
228280
- path: images/build/cross/variants.yaml
229281
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
230282

231-
- name: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
283+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.24-go1.18)"
284+
version: go1.18-bullseye
285+
refPaths:
286+
- path: images/build/cross/variants.yaml
287+
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
288+
289+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.18)"
290+
version: 0
291+
refPaths:
292+
- path: images/build/cross/Makefile
293+
match: REVISION \?= \d+
294+
- path: images/build/cross/variants.yaml
295+
match: REVISION:\ '\d+'
296+
297+
- name: "k8s.gcr.io/build-image/kube-cross (v1.23-go1.19)"
298+
version: v1.23.0-go1.19.5-bullseye.0
299+
refPaths:
300+
- path: images/build/cross/variants.yaml
301+
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
302+
303+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (v1.23-go1.19)"
232304
version: go1.19-bullseye
233305
refPaths:
234306
- path: images/build/cross/variants.yaml
235307
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
236308

237-
- name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)"
309+
- name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.23-go1.19)"
310+
version: 0
311+
refPaths:
312+
- path: images/build/cross/Makefile
313+
match: REVISION \?= \d+
314+
- path: images/build/cross/variants.yaml
315+
match: REVISION:\ '\d+'
316+
317+
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)"
238318
version: v1.27.0-go1.20-bullseye.0
239319
refPaths:
240320
- path: images/k8s-cloud-builder/variants.yaml
241321
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
242322

323+
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.20)"
324+
version: v1.26.0-go1.19.5-bullseye.0
325+
refPaths:
326+
- path: images/k8s-cloud-builder/variants.yaml
327+
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
328+
329+
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.25-cross1.20)"
330+
version: v1.25.0-go1.19.5-bullseye.0
331+
refPaths:
332+
- path: images/k8s-cloud-builder/variants.yaml
333+
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
334+
335+
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.24-cross1.20)"
336+
version: v1.24.0-go1.19.5-bullseye.0
337+
refPaths:
338+
- path: images/k8s-cloud-builder/variants.yaml
339+
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
340+
341+
- name: "k8s.gcr.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.23-cross1.20)"
342+
version: v1.23.0-go1.19.5-bullseye.0
343+
refPaths:
344+
- path: images/k8s-cloud-builder/variants.yaml
345+
match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
346+
347+
# Golang (next candidate)
348+
- name: "golang (next candidate)"
349+
version: 1.20
350+
refPaths:
351+
- path: images/build/cross/variants.yaml
352+
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
353+
- path: images/build/go-runner/variants.yaml
354+
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
355+
- path: images/releng/ci/variants.yaml
356+
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
357+
- path: images/releng/k8s-ci-builder/variants.yaml
358+
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
359+
360+
# Golang images (next candidate)
361+
- name: "gcr.io/k8s-staging-releng/releng-ci: image revision (next candidate)"
362+
version: 0
363+
refPaths:
364+
- path: images/releng/ci/variants.yaml
365+
match: REVISION:\ '\d+'
366+
367+
- name: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)"
368+
version: go1.20-bullseye
369+
refPaths:
370+
- path: images/build/cross/variants.yaml
371+
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
372+
243373
# Golang (previous release branches: 1.24)
244374
- name: "golang (previous release branches: 1.24)"
245375
version: 1.19.5
@@ -281,42 +411,6 @@ dependencies:
281411
- path: images/releng/ci/variants.yaml
282412
match: REVISION:\ '\d+'
283413

284-
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)"
285-
version: v2.3.1-go1.19.5-bullseye.0
286-
refPaths:
287-
- path: images/build/go-runner/variants.yaml
288-
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
289-
290-
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.23)"
291-
version: v2.3.1-go1.17.13-bullseye.0
292-
refPaths:
293-
- path: images/build/go-runner/variants.yaml
294-
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
295-
296-
- name: "k8s.gcr.io/build-image/go-runner: image revision (for previous release branches)"
297-
version: 0
298-
refPaths:
299-
- path: images/build/go-runner/variants.yaml
300-
match: REVISION:\ '\d+'
301-
302-
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.25)"
303-
version: v1.25.0-go1.19.5-bullseye.0
304-
refPaths:
305-
- path: images/build/cross/variants.yaml
306-
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
307-
308-
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)"
309-
version: v1.24.0-go1.19.5-bullseye.0
310-
refPaths:
311-
- path: images/build/cross/variants.yaml
312-
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
313-
314-
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.23)"
315-
version: v1.23.0-go1.19.5-bullseye.0
316-
refPaths:
317-
- path: images/build/cross/variants.yaml
318-
match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
319-
320414
# golangci-lint-version
321415
- name: "golangci-lint"
322416
version: 1.51.0
@@ -413,7 +507,7 @@ dependencies:
413507
match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
414508

415509
- name: "k8s.gcr.io/build-image/go-runner: dependents"
416-
version: v2.3.1-go1.19.1-bullseye.0
510+
version: v2.3.1-go1.19.5-bullseye.0
417511
refPaths:
418512
- path: images/build/debian-iptables/Makefile
419513
match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+

0 commit comments

Comments
 (0)