Skip to content

Commit

Permalink
Merge pull request #3488 from cpanato/udpate-go
Browse files Browse the repository at this point in the history
Build Go 1.22.1 and 1.21.8
  • Loading branch information
k8s-ci-robot committed Mar 5, 2024
2 parents 709cd88 + 4fa9969 commit 3a88d4d
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
24 changes: 12 additions & 12 deletions dependencies.yaml
Expand Up @@ -22,7 +22,7 @@ dependencies:

# Golang
- name: "golang"
version: 1.22
version: 1.22.1
refPaths:
- path: images/build/cross/Makefile
match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down Expand Up @@ -113,7 +113,7 @@ dependencies:

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

- name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)"
version: v2.3.1-go1.21.7-bookworm.0
version: v2.3.1-go1.21.8-bookworm.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 @@ -142,7 +142,7 @@ dependencies:

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
version: v1.30.0-go1.22.0-bullseye.0
version: v1.30.0-go1.22.1-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 @@ -162,7 +162,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.21)"
version: v1.29.0-go1.21.7-bullseye.0
version: v1.29.0-go1.21.8-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 @@ -182,7 +182,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
version: v1.28.0-go1.21.7-bullseye.0
version: v1.28.0-go1.21.8-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 @@ -202,7 +202,7 @@ dependencies:
match: REVISION:\ '\d+'

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

- name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.21)"
version: v1.26.0-go1.21.7-bullseye.0
version: v1.26.0-go1.21.8-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 @@ -305,7 +305,7 @@ dependencies:

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

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

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

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
version: 1.21.7
version: 1.21.8
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
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.30.0
GO_VERSION ?= 1.22.0
GO_VERSION ?= 1.22.1
GO_MAJOR_VERSION ?= 1.22
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
20 changes: 10 additions & 10 deletions images/build/cross/variants.yaml
Expand Up @@ -2,45 +2,45 @@ variants:
v1.30-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.30.0-go1.22.0-bullseye.0'
IMAGE_VERSION: 'v1.30.0-go1.22.1-bullseye.0'
KUBERNETES_VERSION: 'v1.30.0'
GO_VERSION: '1.22.0'
GO_VERSION: '1.22.1'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.29-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.29.0-go1.21.7-bullseye.0'
IMAGE_VERSION: 'v1.29.0-go1.21.8-bullseye.0'
KUBERNETES_VERSION: 'v1.29.0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.28-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.21.7-bullseye.0'
IMAGE_VERSION: 'v1.28.0-go1.21.8-bullseye.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.27-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.27.0-go1.21.7-bullseye.0'
IMAGE_VERSION: 'v1.27.0-go1.21.8-bullseye.0'
KUBERNETES_VERSION: 'v1.27.0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.26-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.26.0-go1.21.7-bullseye.0'
IMAGE_VERSION: 'v1.26.0-go1.21.8-bullseye.0'
KUBERNETES_VERSION: 'v1.26.0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
2 changes: 1 addition & 1 deletion images/build/go-runner/Makefile
Expand Up @@ -19,7 +19,7 @@ IMGNAME = go-runner
APP_VERSION = $(shell cat VERSION)
GO_MAJOR_VERSION ?= 1.22
REVISION ?= 0
GO_VERSION ?= 1.22.0
GO_VERSION ?= 1.22.1
OS_CODENAME ?= bookworm

# Build args
Expand Down
12 changes: 6 additions & 6 deletions images/build/go-runner/variants.yaml
@@ -1,25 +1,25 @@
variants:
go1.22-bookworm:
CONFIG: 'go1.22-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.22.0-bookworm.0'
IMAGE_VERSION: 'v2.3.1-go1.22.1-bookworm.0'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.22.0'
GO_VERSION: '1.22.1'
DISTROLESS_IMAGE: 'static-debian12'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
IMAGE_VERSION: 'v2.3.1-go1.21.7-bookworm.0'
IMAGE_VERSION: 'v2.3.1-go1.21.8-bookworm.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bookworm'
REVISION: '0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
DISTROLESS_IMAGE: 'static-debian12'
go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.21.7-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.21.8-bullseye.0'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
DISTROLESS_IMAGE: 'static-debian11'
4 changes: 2 additions & 2 deletions images/releng/ci/variants.yaml
@@ -1,11 +1,11 @@
variants:
go1.22-bookworm:
CONFIG: 'go1.22-bookworm'
GO_VERSION: '1.22.0'
GO_VERSION: '1.22.1'
OS_CODENAME: 'bookworm'
REVISION: '0'
go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
GO_VERSION: '1.21.7'
GO_VERSION: '1.21.8'
OS_CODENAME: 'bookworm'
REVISION: '0'

0 comments on commit 3a88d4d

Please sign in to comment.