Skip to content

kube-cross: Build v1.14.2-3 and v1.13.9-4 images #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2020
Merged

kube-cross: Build v1.14.2-3 and v1.13.9-4 images #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a73a175
kube-cross: Build v1.14.2-3 and v1.13.9-4 images
justaugustus May 6, 2020
3dbc10e
kube-cross: Zero out substitution values in GCB config
justaugustus May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions images/build/cross/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ IMAGE=kube-cross

TAG?=$(shell git describe --tags --always --dirty)
CONFIG?=go1.14
KUBE_CROSS_VERSION?=v1.14.2-2
KUBE_CROSS_VERSION?=v1.14.2-3

# Build args
GO_VERSION?=1.14.2
PROTOBUF_VERSION?=3.0.2
ETCD_VERSION?=v3.2.24
SKOPEO_VERSION?=v0.1.41
PROTOBUF_VERSION?=3.11.4
ETCD_VERSION?=v3.4.7
SKOPEO_VERSION?=v0.2.0

# TODO: Support multi-arch kube-cross images
# ref:
Expand Down
12 changes: 6 additions & 6 deletions images/build/cross/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ substitutions:
# can be used as a substitution
_GIT_TAG: '12345'
_PULL_BASE_REF: 'dev'
_CONFIG: 'go1.14'
_GO_VERSION: '1.14.2'
_KUBE_CROSS_VERSION: 'v1.14.2-2'
_PROTOBUF_VERSION: '3.0.2'
_ETCD_VERSION: 'v3.2.24'
_SKOPEO_VERSION: 'v0.1.41'
_CONFIG: 'go0.0'
_GO_VERSION: '0.0.0'
_KUBE_CROSS_VERSION: 'v0.0.0-0'
_PROTOBUF_VERSION: '0.0.0'
_ETCD_VERSION: 'v0.0.0'
_SKOPEO_VERSION: 'v0.0.0'
images:
- 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_KUBE_CROSS_VERSION'
- 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_GIT_TAG-$_CONFIG'
18 changes: 10 additions & 8 deletions images/build/cross/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ variants:
go1.14:
CONFIG: 'go1.14'
GO_VERSION: '1.14.2'
KUBE_CROSS_VERSION: 'v1.14.2-2'
PROTOBUF_VERSION: '3.0.2'
ETCD_VERSION: 'v3.2.24'
SKOPEO_VERSION: 'v0.1.41'
KUBE_CROSS_VERSION: 'v1.14.2-3'
PROTOBUF_VERSION: '3.11.4'
ETCD_VERSION: 'v3.4.7'
SKOPEO_VERSION: 'v0.2.0'
go1.13:
CONFIG: 'go1.13'
GO_VERSION: '1.13.9'
KUBE_CROSS_VERSION: 'v1.13.9-3'
PROTOBUF_VERSION: '3.0.2'
ETCD_VERSION: 'v3.2.24'
SKOPEO_VERSION: 'v0.1.41'
KUBE_CROSS_VERSION: 'v1.13.9-4'
PROTOBUF_VERSION: '3.11.4'
ETCD_VERSION: 'v3.4.7'
SKOPEO_VERSION: 'v0.2.0'
# DO NOT UPDATE CONFIGS BELOW THIS COMMENT
# The following Go versions are out of support
go1.12:
CONFIG: 'go1.12'
GO_VERSION: '1.12.17'
Expand Down