Skip to content

Commit

Permalink
build Go 1.18.2 and 1.17.10 images
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed May 11, 2022
1 parent 6357c75 commit ea7478d
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-kubepkg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.17.9-buster AS builder
FROM golang:1.18.2-buster AS builder

ENV GO111MODULE=on

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-kubepkg-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.17.9-buster AS builder
FROM golang:1.18.2-buster AS builder

ENV GO111MODULE=on

Expand Down
14 changes: 7 additions & 7 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies:

# Golang
- name: "golang"
version: 1.17.9
version: 1.18.2
refPaths:
- path: Dockerfile-kubepkg
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
Expand All @@ -78,7 +78,7 @@ dependencies:
# This entry is a stub of the major version to allow dependency checks to
# pass when building Kubernetes using a pre-release of Golang.
- name: "golang: 1.<major>"
version: 1.17
version: 1.18
refPaths:
- path: images/build/cross/Makefile
match: GO_MAJOR_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -147,7 +147,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner"
version: v2.3.1-go1.17.9-bullseye.0
version: v2.3.1-go1.17.10-bullseye.0
refPaths:
- path: images/build/go-runner/variants.yaml
match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
Expand All @@ -161,7 +161,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross"
version: v1.24.0-go1.17.9-bullseye.0
version: v1.25.0-go1.18.2-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand Down Expand Up @@ -207,7 +207,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner (next candidate)"
version: v2.3.1-go1.18.1-bullseye.0
version: v2.3.1-go1.18.2-bullseye.0
refPaths:
- path: images/build/go-runner/variants.yaml
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-]+)*))?)'"
Expand All @@ -219,7 +219,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
version: v1.24.0-go1.18.1-bullseye.0
version: v1.25.0-go1.18.2-bullseye.0
refPaths:
- path: images/build/cross/variants.yaml
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-]+)*))?)'"
Expand All @@ -238,7 +238,7 @@ dependencies:

# Golang (previous release branches: 1.23)
- name: "golang (previous release branches: 1.23)"
version: 1.17.9
version: 1.17.10
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
4 changes: 2 additions & 2 deletions images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ IMGNAME = kube-cross
# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
# - v1.100-go1.17-bullseye.0 does not
KUBERNETES_VERSION ?= v1.23.0
GO_VERSION ?= 1.17.9
GO_MAJOR_VERSION ?= 1.17
GO_VERSION ?= 1.18.2
GO_MAJOR_VERSION ?= 1.18
OS_CODENAME ?= bullseye
REVISION ?= 0
TYPE ?= default
Expand Down
20 changes: 15 additions & 5 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
variants:
v1.25-go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.25.0-go1.18.2-bullseye.0'
KUBERNETES_VERSION: 'v1.25.0'
GO_VERSION: '1.18.2'
GO_MAJOR_VERSION: '1.18'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.24-go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.24.0-go1.18.1-bullseye.0'
IMAGE_VERSION: 'v1.24.0-go1.18.2-bullseye.0'
KUBERNETES_VERSION: 'v1.24.0'
GO_VERSION: '1.18.1'
GO_VERSION: '1.18.2'
GO_MAJOR_VERSION: '1.18'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.24-go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.24.0-go1.17.9-bullseye.0'
IMAGE_VERSION: 'v1.24.0-go1.17.10-bullseye.0'
KUBERNETES_VERSION: 'v1.24.0'
GO_VERSION: '1.17.9'
GO_VERSION: '1.17.10'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
Expand All @@ -24,7 +34,7 @@ variants:
TYPE: 'default'
IMAGE_VERSION: 'v1.23.0-go1.17.9-bullseye.0'
KUBERNETES_VERSION: 'v1.23.0'
GO_VERSION: '1.17.9'
GO_VERSION: '1.17.10'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
Expand Down
4 changes: 2 additions & 2 deletions images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ include $(CURDIR)/../../Makefile.common-image

IMGNAME = go-runner
APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.17
GO_MAJOR_VERSION ?= 1.18
REVISION ?= 0

# Build args
GO_VERSION ?= 1.17.9
GO_VERSION ?= 1.18.2
OS_CODENAME ?= bullseye
DISTROLESS_IMAGE ?= static-debian11

Expand Down
8 changes: 4 additions & 4 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
variants:
go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.18.1-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.18.2-bullseye.0'
GO_MAJOR_VERSION: '1.18'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.18.1'
GO_VERSION: '1.18.2'
DISTROLESS_IMAGE: 'static-debian11'
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.17.9-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.17.10-bullseye.0'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.17.9'
GO_VERSION: '1.17.10'
DISTROLESS_IMAGE: 'static-debian11'
go1.16-buster:
CONFIG: 'go1.16-buster'
Expand Down
4 changes: 2 additions & 2 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
variants:
go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
GO_VERSION: '1.18.1'
GO_VERSION: '1.18.2'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
GO_VERSION: '1.17.9'
GO_VERSION: '1.17.10'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.16-buster:
Expand Down
2 changes: 1 addition & 1 deletion packages/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.17.9-bullseye
FROM golang:1.18.2-bullseye

RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -y \
Expand Down

0 comments on commit ea7478d

Please sign in to comment.