From 57ab6082ae2443db043e412351dad94b94dd1451 Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 2 Aug 2022 11:13:31 +0200 Subject: [PATCH] build Go 1.18.5 and 1.17.13 images Signed-off-by: cpanato --- Dockerfile-kubepkg | 2 +- Dockerfile-kubepkg-rpm | 2 +- dependencies.yaml | 18 +++++++++--------- images/build/cross/Makefile | 2 +- images/build/cross/variants.yaml | 12 ++++++------ 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, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index ffea60e444b..1a14562980b 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.18.4-buster AS builder +FROM golang:1.18.5-buster AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index 6e429262122..ed5855c0df7 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.18.4-buster AS builder +FROM golang:1.18.5-buster AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index 037b62305a6..a649013f7a4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -53,7 +53,7 @@ dependencies: # Golang - name: "golang" - version: 1.18.4 + version: 1.18.5 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -147,7 +147,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner" - version: v2.3.1-go1.17.12-bullseye.0 + version: v2.3.1-go1.17.13-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-]+)*))?) @@ -161,7 +161,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.25.0-go1.18.4-bullseye.0 + version: v1.25.0-go1.18.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-]+)*))?)'" @@ -238,7 +238,7 @@ dependencies: # Golang (previous release branches: 1.24) - name: "golang (previous release branches: 1.24)" - version: 1.18.4 + version: 1.18.5 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -255,7 +255,7 @@ dependencies: # Golang (previous release branches: 1.23) - name: "golang (previous release branches: 1.23)" - version: 1.17.12 + version: 1.17.13 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -295,13 +295,13 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)" - version: v2.3.1-go1.18.4-bullseye.0 + version: v2.3.1-go1.18.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-]+)*))?) - name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.23)" - version: v2.3.1-go1.17.12-bullseye.0 + version: v2.3.1-go1.17.13-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-]+)*))?) @@ -319,13 +319,13 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)" - version: v1.24.0-go1.18.4-bullseye.0 + version: v1.24.0-go1.18.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.23)" - version: v1.23.0-go1.17.12-bullseye.0 + version: v1.23.0-go1.17.13-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 0db7934b94d..4faebbec3fd 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.24.0 -GO_VERSION ?= 1.18.4 +GO_VERSION ?= 1.18.5 GO_MAJOR_VERSION ?= 1.18 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 4f4155cb924..8e11980f259 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -12,9 +12,9 @@ variants: v1.25-go1.18-bullseye: CONFIG: 'go1.18-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.25.0-go1.18.4-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.18.5-bullseye.0' KUBERNETES_VERSION: 'v1.25.0' - GO_VERSION: '1.18.4' + GO_VERSION: '1.18.5' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' @@ -22,9 +22,9 @@ variants: v1.24-go1.18-bullseye: CONFIG: 'go1.18-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.18.4-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.18.5-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.18.4' + GO_VERSION: '1.18.5' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' @@ -32,9 +32,9 @@ variants: v1.23-go1.17-bullseye: CONFIG: 'go1.17-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.23.0-go1.17.12-bullseye.0' + IMAGE_VERSION: 'v1.23.0-go1.17.13-bullseye.0' KUBERNETES_VERSION: 'v1.23.0' - GO_VERSION: '1.17.12' + GO_VERSION: '1.17.13' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 3cbdd2d8aec..05db671ed30 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.18 REVISION ?= 0 # Build args -GO_VERSION ?= 1.18.4 +GO_VERSION ?= 1.18.5 OS_CODENAME ?= bullseye DISTROLESS_IMAGE ?= static-debian11 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 7bef9bbd3f3..c9654664043 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -9,19 +9,19 @@ variants: DISTROLESS_IMAGE: 'static-debian11' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.18.4-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.18.5-bullseye.0' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.18.4' + GO_VERSION: '1.18.5' DISTROLESS_IMAGE: 'static-debian11' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.17.12-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.17.13-bullseye.0' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.17.12' + GO_VERSION: '1.17.13' DISTROLESS_IMAGE: 'static-debian11' go1.16-buster: CONFIG: 'go1.16-buster' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index e5f33825eef..eb7695d7708 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -6,12 +6,12 @@ variants: REVISION: '0' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - GO_VERSION: '1.18.4' + GO_VERSION: '1.18.5' OS_CODENAME: 'bullseye' REVISION: '0' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - GO_VERSION: '1.17.12' + GO_VERSION: '1.17.13' OS_CODENAME: 'bullseye' REVISION: '0' go1.16-buster: diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index b7b295e404f..a18d249c50e 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.18.4-bullseye +FROM golang:1.18.5-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \