Skip to content

Commit

Permalink
[go] Build go1.17.5 and go1.16.12 images
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Dec 10, 2021
1 parent d03850e commit aaf5553
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 36 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.4-buster AS builder
FROM golang:1.17.5-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.4-buster AS builder
FROM golang:1.17.5-buster AS builder

ENV GO111MODULE=on

Expand Down
28 changes: 17 additions & 11 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.4
version: 1.17.5
refPaths:
- path: Dockerfile-kubepkg
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
Expand Down Expand Up @@ -127,7 +127,7 @@ dependencies:
# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
# - v1.100-go1.17-bullseye.0 does not
- name: "Kubernetes version (stable.0)"
version: v1.22.0
version: v1.23.0
refPaths:
- path: images/build/cross/Makefile
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-]+)*))?)
Expand All @@ -147,7 +147,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner"
version: v2.3.1-go1.17.4-bullseye.0
version: v2.3.1-go1.17.5-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.4-bullseye.0
version: v1.24.0-go1.17.5-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 @@ -213,7 +213,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner (next candidate)"
version: v2.3.1-go1.17.4-bullseye.0
version: v2.3.1-go1.17.5-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 @@ -225,7 +225,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
version: v1.24.0-go1.17.4-bullseye.0
version: v1.24.0-go1.17.5-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 @@ -244,7 +244,7 @@ dependencies:

# Golang (previous release branches: 1.22, 1.21)
- name: "golang (previous release branches: 1.22, 1.21)"
version: 1.16.11
version: 1.16.12
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -274,7 +274,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.22, 1.21)"
version: v2.3.1-go1.16.11-buster.0
version: v2.3.1-go1.16.12-buster.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 @@ -290,13 +290,19 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.23)"
version: v1.23.0-go1.17.4-bullseye.0
version: v1.23.0-go1.17.5-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-]+)*))?)'"

- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.22)"
version: v1.22.0-go1.16.12-buster.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-]+)*))?)'"

- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.22, 1.21)"
version: v1.22.0-go1.16.11-buster.0
- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.21)"
version: v1.21.0-go1.16.12-buster.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
4 changes: 2 additions & 2 deletions images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ IMGNAME = kube-cross
# Example:
# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
# - v1.100-go1.17-bullseye.0 does not
KUBERNETES_VERSION ?= v1.22.0
GO_VERSION ?= 1.17.4
KUBERNETES_VERSION ?= v1.23.0
GO_VERSION ?= 1.17.5
GO_MAJOR_VERSION ?= 1.17
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
20 changes: 10 additions & 10 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ variants:
v1.24-go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.24.0-go1.17.4-bullseye.0'
IMAGE_VERSION: 'v1.24.0-go1.17.5-bullseye.0'
KUBERNETES_VERSION: 'v1.24.0'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.7.0'
v1.23-go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.23.0-go1.17.4-bullseye.0'
IMAGE_VERSION: 'v1.23.0-go1.17.5-bullseye.0'
KUBERNETES_VERSION: 'v1.23.0'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.7.0'
v1.23-go1.17-buster:
CONFIG: 'go1.17-buster'
TYPE: 'default'
IMAGE_VERSION: 'v1.23.0-go1.17.4-buster.0'
IMAGE_VERSION: 'v1.23.0-go1.17.5-buster.0'
KUBERNETES_VERSION: 'v1.23.0'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'buster'
REVISION: '0'
PROTOBUF_VERSION: '3.7.0'
v1.22-go1.16-buster:
CONFIG: 'go1.16-buster'
TYPE: 'default'
IMAGE_VERSION: 'v1.22.0-go1.16.11-buster.0'
IMAGE_VERSION: 'v1.22.0-go1.16.12-buster.0'
KUBERNETES_VERSION: 'v1.22.0'
GO_VERSION: '1.16.11'
GO_VERSION: '1.16.12'
GO_MAJOR_VERSION: '1.16'
OS_CODENAME: 'buster'
REVISION: '0'
PROTOBUF_VERSION: '3.7.0'
v1.21-go1.16-buster:
CONFIG: 'go1.16-buster'
TYPE: 'default'
IMAGE_VERSION: 'v1.21.0-go1.16.11-buster.0'
IMAGE_VERSION: 'v1.21.0-go1.16.12-buster.0'
KUBERNETES_VERSION: 'v1.21.0'
GO_VERSION: '1.16.11'
GO_VERSION: '1.16.12'
GO_MAJOR_VERSION: '1.16'
OS_CODENAME: 'buster'
REVISION: '0'
Expand Down
2 changes: 1 addition & 1 deletion images/build/go-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.17
REVISION ?= 0

# Build args
GO_VERSION ?= 1.17.4
GO_VERSION ?= 1.17.5
OS_CODENAME ?= bullseye
DISTROLESS_IMAGE ?= static-debian11

Expand Down
12 changes: 6 additions & 6 deletions images/build/go-runner/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
variants:
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.17.4-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.17.5-bullseye.0'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
DISTROLESS_IMAGE: 'static-debian11'
go1.17-buster:
CONFIG: 'go1.17-buster'
IMAGE_VERSION: 'v2.3.1-go1.17.4-buster.0'
IMAGE_VERSION: 'v2.3.1-go1.17.5-buster.0'
GO_MAJOR_VERSION: '1.17'
OS_CODENAME: 'buster'
REVISION: '0'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
DISTROLESS_IMAGE: 'static-debian10'
go1.16-buster:
CONFIG: 'go1.16-buster'
IMAGE_VERSION: 'v2.3.1-go1.16.11-buster.0'
IMAGE_VERSION: 'v2.3.1-go1.16.12-buster.0'
GO_MAJOR_VERSION: '1.16'
OS_CODENAME: 'buster'
REVISION: '0'
GO_VERSION: '1.16.11'
GO_VERSION: '1.16.12'
DISTROLESS_IMAGE: 'static-debian10'
6 changes: 3 additions & 3 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
variants:
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.17-buster:
CONFIG: 'go1.17-buster'
GO_VERSION: '1.17.4'
GO_VERSION: '1.17.5'
OS_CODENAME: 'buster'
REVISION: '0'
go1.16-buster:
CONFIG: 'go1.16-buster'
GO_VERSION: '1.16.11'
GO_VERSION: '1.16.12'
OS_CODENAME: 'buster'
REVISION: '0'
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.4-bullseye
FROM golang:1.17.5-bullseye

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

0 comments on commit aaf5553

Please sign in to comment.