Skip to content

Commit

Permalink
Build Go 1.19.4 and 1.18.9 based images
Browse files Browse the repository at this point in the history
Signed-off-by: Marko Mudrinić <[email protected]>
  • Loading branch information
xmudrii committed Dec 5, 2022
1 parent bbee499 commit ff98023
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 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.19.3-bullseye AS builder
FROM golang:1.19.4-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.19.3-bullseye AS builder
FROM golang:1.19.4-bullseye 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 @@ -57,7 +57,7 @@ dependencies:

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

- name: "k8s.gcr.io/build-image/kube-cross"
version: v1.25.0-go1.19.3-bullseye.0
version: v1.25.0-go1.19.4-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 @@ -211,7 +211,7 @@ dependencies:
match: REVISION:\ '\d+'

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

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

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

- name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)"
version: v2.3.1-go1.18.8-bullseye.0
version: v2.3.1-go1.18.9-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 @@ -323,7 +323,7 @@ dependencies:
match: REVISION:\ '\d+'

- name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)"
version: v1.24.0-go1.18.8-bullseye.0
version: v1.24.0-go1.18.9-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
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.25.0
GO_VERSION ?= 1.19.3
GO_VERSION ?= 1.19.4
GO_MAJOR_VERSION ?= 1.19
OS_CODENAME ?= bullseye
REVISION ?= 0
Expand Down
8 changes: 4 additions & 4 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ variants:
v1.25-go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.25.0-go1.19.3-bullseye.0'
IMAGE_VERSION: 'v1.25.0-go1.19.4-bullseye.0'
KUBERNETES_VERSION: 'v1.25.0'
GO_VERSION: '1.19.3'
GO_VERSION: '1.19.4'
GO_MAJOR_VERSION: '1.19'
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.8-bullseye.0'
IMAGE_VERSION: 'v1.24.0-go1.18.9-bullseye.0'
KUBERNETES_VERSION: 'v1.24.0'
GO_VERSION: '1.18.8'
GO_VERSION: '1.18.9'
GO_MAJOR_VERSION: '1.18'
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.19
REVISION ?= 0
GO_VERSION ?= 1.19.3
GO_VERSION ?= 1.19.4
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,19 +1,19 @@
variants:
go1.19-bullseye:
CONFIG: 'go1.19-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.19.3-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.19.4-bullseye.0'
GO_MAJOR_VERSION: '1.19'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.19.3'
GO_VERSION: '1.19.4'
DISTROLESS_IMAGE: 'static-debian11'
go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
IMAGE_VERSION: 'v2.3.1-go1.18.8-bullseye.0'
IMAGE_VERSION: 'v2.3.1-go1.18.9-bullseye.0'
GO_MAJOR_VERSION: '1.18'
OS_CODENAME: 'bullseye'
REVISION: '0'
GO_VERSION: '1.18.8'
GO_VERSION: '1.18.9'
DISTROLESS_IMAGE: 'static-debian11'
go1.17-bullseye:
CONFIG: 'go1.17-bullseye'
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.19-bullseye:
CONFIG: 'go1.19-bullseye'
GO_VERSION: '1.19.3'
GO_VERSION: '1.19.4'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.18-bullseye:
CONFIG: 'go1.18-bullseye'
GO_VERSION: '1.18.8'
GO_VERSION: '1.18.9'
OS_CODENAME: 'bullseye'
REVISION: '0'
go1.17-bullseye:
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.19.3-bullseye
FROM golang:1.19.4-bullseye

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

0 comments on commit ff98023

Please sign in to comment.