From 5e759c7cbc5b0a28873b1cdbfcfcfc1f608135d0 Mon Sep 17 00:00:00 2001 From: Nabarun Pal Date: Wed, 7 Sep 2022 11:24:25 +0530 Subject: [PATCH] Build Go 1.19.1 and 1.18.6 based images Signed-off-by: Nabarun Pal --- Dockerfile-kubepkg | 2 +- Dockerfile-kubepkg-rpm | 2 +- dependencies.yaml | 14 +++++++------- images/build/cross/Makefile | 2 +- images/build/cross/variants.yaml | 8 ++++---- images/build/go-runner/Makefile | 2 +- images/build/go-runner/variants.yaml | 8 ++++---- images/releng/ci/variants.yaml | 4 ++-- packages/deb/Dockerfile | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index a81293296c1..c5416d351d6 100644 --- a/Dockerfile-kubepkg +++ b/Dockerfile-kubepkg @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-bullseye AS builder +FROM golang:1.19.1-bullseye AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index a7cd7cfee7d..2b059266877 100644 --- a/Dockerfile-kubepkg-rpm +++ b/Dockerfile-kubepkg-rpm @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-bullseye AS builder +FROM golang:1.19.1-bullseye AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index 4f45f79da50..560e247b9bd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -59,7 +59,7 @@ dependencies: # Golang - name: "golang" - version: 1.19 + version: 1.19.1 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -167,7 +167,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.25.0-go1.19-bullseye.0 + version: v1.25.0-go1.19.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-]+)*))?)'" @@ -213,7 +213,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (next candidate)" - version: v2.3.1-go1.19-bullseye.0 + version: v2.3.1-go1.19.1-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-]+)*))?)'" @@ -225,7 +225,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (next candidate)" - version: v1.25.0-go1.19-bullseye.0 + version: v1.25.0-go1.19.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-]+)*))?)'" @@ -244,7 +244,7 @@ dependencies: # Golang (previous release branches: 1.24) - name: "golang (previous release branches: 1.24)" - version: 1.18.5 + version: 1.18.6 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -301,7 +301,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)" - version: v2.3.1-go1.18.5-bullseye.0 + version: v2.3.1-go1.18.6-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-]+)*))?) @@ -325,7 +325,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)" - version: v1.24.0-go1.18.5-bullseye.0 + version: v1.24.0-go1.18.6-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-]+)*))?)'" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index db64d1fd339..bfef9c8e1a3 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -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 +GO_VERSION ?= 1.19.1 GO_MAJOR_VERSION ?= 1.19 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 341e20b481c..4c6a9a6653c 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,9 +2,9 @@ variants: v1.25-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.25.0-go1.19-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.19.1-bullseye.0' KUBERNETES_VERSION: 'v1.25.0' - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' @@ -12,9 +12,9 @@ variants: v1.24-go1.18-bullseye: CONFIG: 'go1.18-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.18.5-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.18.6-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.18.5' + GO_VERSION: '1.18.6' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 9469982d54c..c66a016f10c 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.19 REVISION ?= 0 # Build args -GO_VERSION ?= 1.19 +GO_VERSION ?= 1.19.1 OS_CODENAME ?= bullseye DISTROLESS_IMAGE ?= static-debian11 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index b7f7b2525bf..8d300266349 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,19 +1,19 @@ variants: go1.19-bullseye: CONFIG: 'go1.19-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.19-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.19.1-bullseye.0' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' DISTROLESS_IMAGE: 'static-debian11' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.18.5-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.18.6-bullseye.0' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.18.5' + GO_VERSION: '1.18.6' DISTROLESS_IMAGE: 'static-debian11' go1.17-bullseye: CONFIG: 'go1.17-bullseye' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 0102de97565..36f29a2e2d2 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,12 +1,12 @@ variants: go1.19-bullseye: CONFIG: 'go1.19-bullseye' - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' OS_CODENAME: 'bullseye' REVISION: '0' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - GO_VERSION: '1.18.5' + GO_VERSION: '1.18.6' OS_CODENAME: 'bullseye' REVISION: '0' go1.17-bullseye: diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index f0038d50387..5e58734d671 100644 --- a/packages/deb/Dockerfile +++ b/packages/deb/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19-bullseye +FROM golang:1.19.1-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \