Skip to content

Commit 1da89e6

Browse files
authored
Merge pull request #2576 from cpanato/go19
golang: Build 1.19beta1 images
2 parents bbecf5c + 3dca5b7 commit 1da89e6

File tree

5 files changed

+64
-20
lines changed

5 files changed

+64
-20
lines changed

dependencies.yaml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ dependencies:
135135
match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
136136

137137
- name: "Kubernetes version (next candidate.0)"
138-
version: v1.24.0
138+
version: v1.25.0
139139
refPaths:
140140
- path: images/build/cross/variants.yaml
141141
match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -188,7 +188,7 @@ dependencies:
188188

189189
# Golang (next candidate)
190190
- name: "golang (next candidate)"
191-
version: 1.18
191+
version: 1.19beta1
192192
refPaths:
193193
- path: images/build/cross/variants.yaml
194194
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -207,7 +207,7 @@ dependencies:
207207
match: REVISION:\ '\d+'
208208

209209
- name: "k8s.gcr.io/build-image/go-runner (next candidate)"
210-
version: v2.3.1-go1.18.3-bullseye.0
210+
version: v2.3.1-go1.19beta1-bullseye.0
211211
refPaths:
212212
- path: images/build/go-runner/variants.yaml
213213
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-]+)*))?)'"
@@ -219,7 +219,7 @@ dependencies:
219219
match: REVISION:\ '\d+'
220220

221221
- name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
222-
version: v1.25.0-go1.18.3-bullseye.0
222+
version: v1.25.0-go1.19beta1-bullseye.0
223223
refPaths:
224224
- path: images/build/cross/variants.yaml
225225
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-]+)*))?)'"
@@ -236,6 +236,23 @@ dependencies:
236236
- path: images/k8s-cloud-builder/variants.yaml
237237
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-]+)*))?)'"
238238

239+
# Golang (previous release branches: 1.24)
240+
- name: "golang (previous release branches: 1.24)"
241+
version: 1.18.3
242+
refPaths:
243+
- path: images/build/cross/variants.yaml
244+
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
245+
- path: images/build/go-runner/variants.yaml
246+
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
247+
- path: images/releng/ci/variants.yaml
248+
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
249+
250+
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.24)"
251+
version: 1.18.3
252+
refPaths:
253+
- path: images/releng/k8s-ci-builder/variants.yaml
254+
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
255+
239256
# Golang (previous release branches: 1.23)
240257
- name: "golang (previous release branches: 1.23)"
241258
version: 1.17.11
@@ -277,22 +294,36 @@ dependencies:
277294
- path: images/releng/ci/variants.yaml
278295
match: REVISION:\ '\d+'
279296

280-
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.22, 1.21)"
281-
version: v2.3.1-go1.16.15-buster.0
297+
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)"
298+
version: v2.3.1-go1.18.3-bullseye.0
299+
refPaths:
300+
- path: images/build/go-runner/variants.yaml
301+
match: 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/go-runner (previous release branches: 1.23)"
304+
version: v2.3.1-go1.17.11-bullseye.0
282305
refPaths:
283306
- path: images/build/go-runner/variants.yaml
284307
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
285308

286-
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.20)"
287-
version: v2.3.1-go1.15.15-buster.0
309+
- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.22, 1.21)"
310+
version: v2.3.1-go1.16.15-buster.0
288311
refPaths:
312+
- path: images/build/go-runner/variants.yaml
313+
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
289314

290315
- name: "k8s.gcr.io/build-image/go-runner: image revision (for previous release branches)"
291316
version: 0
292317
refPaths:
293318
- path: images/build/go-runner/variants.yaml
294319
match: REVISION:\ '\d+'
295320

321+
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)"
322+
version: v1.24.0-go1.18.3-bullseye.0
323+
refPaths:
324+
- path: images/build/cross/variants.yaml
325+
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-]+)*))?)'"
326+
296327
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.23)"
297328
version: v1.23.0-go1.17.11-bullseye.0
298329
refPaths:

images/build/cross/variants.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
variants:
2+
v1.25-go1.19-bullseye:
3+
CONFIG: 'go1.19-bullseye'
4+
TYPE: 'default'
5+
IMAGE_VERSION: 'v1.25.0-go1.19beta1-bullseye.0'
6+
KUBERNETES_VERSION: 'v1.25.0'
7+
GO_VERSION: '1.19beta1'
8+
GO_MAJOR_VERSION: '1.19'
9+
OS_CODENAME: 'bullseye'
10+
REVISION: '0'
11+
PROTOBUF_VERSION: '3.19.4'
212
v1.25-go1.18-bullseye:
313
CONFIG: 'go1.18-bullseye'
414
TYPE: 'default'
@@ -19,16 +29,6 @@ variants:
1929
OS_CODENAME: 'bullseye'
2030
REVISION: '0'
2131
PROTOBUF_VERSION: '3.19.4'
22-
v1.24-go1.17-bullseye:
23-
CONFIG: 'go1.17-bullseye'
24-
TYPE: 'default'
25-
IMAGE_VERSION: 'v1.24.0-go1.17.11-bullseye.0'
26-
KUBERNETES_VERSION: 'v1.24.0'
27-
GO_VERSION: '1.17.11'
28-
GO_MAJOR_VERSION: '1.17'
29-
OS_CODENAME: 'bullseye'
30-
REVISION: '0'
31-
PROTOBUF_VERSION: '3.19.4'
3232
v1.23-go1.17-bullseye:
3333
CONFIG: 'go1.17-bullseye'
3434
TYPE: 'default'

images/build/go-runner/variants.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
variants:
2+
go1.19-bullseye:
3+
CONFIG: 'go1.19-bullseye'
4+
IMAGE_VERSION: 'v2.3.1-go1.19beta1-bullseye.0'
5+
GO_MAJOR_VERSION: '1.19'
6+
OS_CODENAME: 'bullseye'
7+
REVISION: '0'
8+
GO_VERSION: '1.19beta1'
9+
DISTROLESS_IMAGE: 'static-debian11'
210
go1.18-bullseye:
311
CONFIG: 'go1.18-bullseye'
412
IMAGE_VERSION: 'v2.3.1-go1.18.3-bullseye.0'

images/releng/ci/variants.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
variants:
2+
go1.19-bullseye:
3+
CONFIG: 'go1.19-bullseye'
4+
GO_VERSION: '1.19beta1'
5+
OS_CODENAME: 'bullseye'
6+
REVISION: '0'
27
go1.18-bullseye:
38
CONFIG: 'go1.18-bullseye'
49
GO_VERSION: '1.18.3'

images/releng/k8s-ci-builder/variants.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ variants:
55
OS_CODENAME: 'bullseye'
66
next:
77
CONFIG: next
8-
GO_VERSION: '1.18.3'
8+
GO_VERSION: '1.19beta1'
99
OS_CODENAME: 'bullseye'
1010
'1.25':
1111
CONFIG: '1.25'
12-
GO_VERSION: '1.18.3'
12+
GO_VERSION: '1.19beta1'
1313
OS_CODENAME: 'bullseye'
1414
'1.24':
1515
CONFIG: '1.24'

0 commit comments

Comments
 (0)