Skip to content

Commit

Permalink
Merge pull request #3105 from jeremyrickard/june06-go-updates-image-u…
Browse files Browse the repository at this point in the history
…pdates

Build Go 1.19.10 and Go 1.20.5 images
  • Loading branch information
k8s-ci-robot authored Jun 7, 2023
2 parents c3c33ec + 379a453 commit 5174b14
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 29 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.20.4-bullseye AS builder
FROM golang:1.20.5-bullseye 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.20.4-bullseye AS builder
FROM golang:1.20.5-bullseye AS builder

ENV GO111MODULE=on

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

# Golang
- name: "golang"
version: 1.20.4
version: 1.20.5
refPaths:
- path: Dockerfile-kubepkg
match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
Expand Down Expand Up @@ -152,7 +152,7 @@ dependencies:

# go-runner
- name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
version: v2.3.1-go1.20.4-bullseye.0
version: v2.3.1-go1.20.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 @@ -166,7 +166,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/go-runner (go1.19-bullseye)"
version: v2.3.1-go1.19.9-bullseye.0
version: v2.3.1-go1.19.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 @@ -181,7 +181,7 @@ dependencies:

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
version: v1.27.0-go1.20.4-bullseye.0
version: v1.27.0-go1.20.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 @@ -201,7 +201,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.19)"
version: v1.26.0-go1.19.9-bullseye.0
version: v1.26.0-go1.19.10-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 @@ -221,7 +221,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.19)"
version: v1.25.0-go1.19.9-bullseye.0
version: v1.25.0-go1.19.10-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 @@ -241,7 +241,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.24-go1.19)"
version: v1.24.0-go1.19.9-bullseye.0
version: v1.24.0-go1.19.10-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 @@ -312,7 +312,7 @@ dependencies:

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
version: 1.19.9
version: 1.19.10
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -329,7 +329,7 @@ dependencies:

# Golang (previous release branches: 1.25)
- name: "golang (previous release branches: 1.25)"
version: 1.19.9
version: 1.19.10
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand All @@ -346,7 +346,7 @@ dependencies:

# Golang (previous release branches: 1.24)
- name: "golang (previous release branches: 1.24)"
version: 1.19.9
version: 1.19.10
refPaths:
- path: images/build/cross/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
2 changes: 1 addition & 1 deletion images/build/cross/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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.27.0
GO_VERSION ?= 1.20.4
GO_VERSION ?= 1.20.5
GO_MAJOR_VERSION ?= 1.20
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
16 changes: 8 additions & 8 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@ variants:
v1.27-go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.27.0-go1.20.4-bullseye.0'
IMAGE_VERSION: 'v1.27.0-go1.20.5-bullseye.0'
KUBERNETES_VERSION: 'v1.27.0'
GO_VERSION: '1.20.4'
GO_VERSION: '1.20.5'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.26-go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.26.0-go1.19.9-bullseye.0'
IMAGE_VERSION: 'v1.26.0-go1.19.10-bullseye.0'
KUBERNETES_VERSION: 'v1.26.0'
GO_VERSION: '1.19.9'
GO_VERSION: '1.19.10'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.25-go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.25.0-go1.19.9-bullseye.0'
IMAGE_VERSION: 'v1.25.0-go1.19.10-bullseye.0'
KUBERNETES_VERSION: 'v1.25.0'
GO_VERSION: '1.19.9'
GO_VERSION: '1.19.10'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.24-go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.24.0-go1.19.9-bullseye.0'
IMAGE_VERSION: 'v1.24.0-go1.19.10-bullseye.0'
KUBERNETES_VERSION: 'v1.24.0'
GO_VERSION: '1.19.9'
GO_VERSION: '1.19.10'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
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 @@ -19,7 +19,7 @@ IMGNAME = go-runner
APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.20
REVISION ?= 0
GO_VERSION ?= 1.20.4
GO_VERSION ?= 1.20.5
OS_CODENAME ?= bullseye

# Build args
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,17 +1,17 @@
variants:
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.20.4-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.20.5-bullseye.0'
GO_MAJOR_VERSION: '1.20'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.20.4'
GO_VERSION: '1.20.5'
DISTROLESS_IMAGE: 'static-debian11'
go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.19.9-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.19.10-bullseye.0'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.19.9'
GO_VERSION: '1.19.10'
DISTROLESS_IMAGE: 'static-debian11'
4 changes: 2 additions & 2 deletions images/releng/ci/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
variants:
go1.20-bullseye:
CONFIG: 'go1.20-bullseye'
GO_VERSION: '1.20.4'
GO_VERSION: '1.20.5'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
GO_VERSION: '1.19.9'
GO_VERSION: '1.19.10'
OS_CODENAME: 'bullseye'
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.20.4-bullseye
FROM golang:1.20.5-bullseye

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

0 comments on commit 5174b14

Please sign in to comment.