From 521d25315ca8cdba0a69cd2def36ddcd81c3e95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Mon, 31 Oct 2022 09:25:27 +0100 Subject: [PATCH] Build Go 1.19.3 and 1.18.8 based images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- 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 110d8145581..d9a75374143 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.2-bullseye AS builder +FROM golang:1.19.3-bullseye AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index aac90c5aa7b..1d2c68d7c8d 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.2-bullseye AS builder +FROM golang:1.19.3-bullseye AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index 26c96bc88d1..1052f7983f7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -57,7 +57,7 @@ dependencies: # Golang - name: "golang" - version: 1.19.2 + version: 1.19.3 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -165,7 +165,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.25.0-go1.19.2-bullseye.0 + version: v1.25.0-go1.19.3-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-]+)*))?)'" @@ -211,7 +211,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (next candidate)" - version: v2.3.1-go1.19.2-bullseye.0 + version: v2.3.1-go1.19.3-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-]+)*))?)'" @@ -223,7 +223,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (next candidate)" - version: v1.25.0-go1.19.2-bullseye.0 + version: v1.25.0-go1.19.3-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-]+)*))?)'" @@ -242,7 +242,7 @@ dependencies: # Golang (previous release branches: 1.24) - name: "golang (previous release branches: 1.24)" - version: 1.18.7 + version: 1.18.8 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -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.7-bullseye.0 + version: v2.3.1-go1.18.8-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-]+)*))?) @@ -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.7-bullseye.0 + version: v1.24.0-go1.18.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-]+)*))?)'" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index cff6bc85b59..31dff6f50ba 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.2 +GO_VERSION ?= 1.19.3 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 bb945734ec8..68392930910 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.2-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.19.3-bullseye.0' KUBERNETES_VERSION: 'v1.25.0' - GO_VERSION: '1.19.2' + GO_VERSION: '1.19.3' 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.7-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.18.8-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.18.7' + GO_VERSION: '1.18.8' 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 a326fba9716..c9e8edc8efa 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.2 +GO_VERSION ?= 1.19.3 OS_CODENAME ?= bullseye DISTROLESS_IMAGE ?= static-debian11 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 9dd793e7a1b..7021d16e6ac 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.2-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.19.3-bullseye.0' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.19.2' + GO_VERSION: '1.19.3' DISTROLESS_IMAGE: 'static-debian11' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.18.7-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.18.8-bullseye.0' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.18.7' + GO_VERSION: '1.18.8' 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 9d6216b23f6..9bd3e32e219 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.2' + GO_VERSION: '1.19.3' OS_CODENAME: 'bullseye' REVISION: '0' go1.18-bullseye: CONFIG: 'go1.18-bullseye' - GO_VERSION: '1.18.7' + GO_VERSION: '1.18.8' OS_CODENAME: 'bullseye' REVISION: '0' go1.17-bullseye: diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index 142ca92f51d..100f9fcab51 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.2-bullseye +FROM golang:1.19.3-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \