Skip to content

Commit b29efe9

Browse files
authored
Merge pull request #1487 from justaugustus/kube-cross
kube-cross: Build v1.15.0-1 image
2 parents 854a7b4 + bd017d9 commit b29efe9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dependencies.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ dependencies:
4545

4646
# Golang
4747
- name: "golang"
48-
version: 1.15rc2
48+
version: 1.15.0
4949
refPaths:
5050
- path: images/build/cross/variants.yaml
51-
match: \d+.\d+(alpha|beta|rc)\d+
51+
match: \d+.\d+(alpha|beta|rc)?\.?\d+
5252

5353
- name: "k8s.gcr.io/kube-cross"
54-
version: v1.15.0-rc.2-1
54+
version: v1.15.0-1
5555
refPaths:
5656
- path: images/build/cross/variants.yaml
5757
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+

images/build/cross/variants.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
variants:
22
canary:
33
CONFIG: 'canary'
4-
GO_VERSION: '1.15rc2'
5-
KUBE_CROSS_VERSION: 'v1.15.0-rc.2-canary-1'
4+
GO_VERSION: '1.15.0'
5+
KUBE_CROSS_VERSION: 'v1.15.0-canary-1'
66
PROTOBUF_VERSION: '3.0.2'
77
ETCD_VERSION: 'v3.4.9'
88
go1.15:
99
CONFIG: 'go1.15'
10-
GO_VERSION: '1.15rc2'
11-
KUBE_CROSS_VERSION: 'v1.15.0-rc.2-1'
10+
GO_VERSION: '1.15.0'
11+
KUBE_CROSS_VERSION: 'v1.15.0-1'
1212
PROTOBUF_VERSION: '3.0.2'
1313
ETCD_VERSION: 'v3.4.9'
1414
go1.14:

0 commit comments

Comments
 (0)