From 3382da8fa38e89ba749a961ef11c7c8ca78145b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Mon, 5 Dec 2022 12:11:57 +0100 Subject: [PATCH 1/3] Build Go 1.19.4 and 1.18.9 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 | 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, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index d9a75374143..27a88c739d1 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.3-bullseye AS builder +FROM golang:1.19.4-bullseye AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index 1d2c68d7c8d..2a4df4dcc4f 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.3-bullseye AS builder +FROM golang:1.19.4-bullseye AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index d586ea05c97..5cc87440189 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -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-]+)*))?)'" @@ -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-]+)*))?)'" @@ -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-]+)*))?)'" @@ -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+)? @@ -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-]+)*))?) @@ -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-]+)*))?)'" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index 31dff6f50ba..3adca91071a 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.3 +GO_VERSION ?= 1.19.4 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 d1081f4cdab..2d1f0e484cf 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,9 +2,9 @@ variants: v1.26-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.26.0-go1.19.3-bullseye.0' + IMAGE_VERSION: 'v1.26.0-go1.19.4-bullseye.0' KUBERNETES_VERSION: 'v1.26.0' - GO_VERSION: '1.19.3' + GO_VERSION: '1.19.4' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' @@ -12,9 +12,9 @@ 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' @@ -22,9 +22,9 @@ variants: 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' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 22ba9356352..cc13f80c4ad 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -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 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 7021d16e6ac..4fbaa2879fd 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.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' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 9bd3e32e219..2ad1bba508f 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.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: diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index 100f9fcab51..c1b2b916c48 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.3-bullseye +FROM golang:1.19.4-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \ From d84223f4e955eb5940d474986bae77b4675ce33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 6 Dec 2022 19:52:37 +0100 Subject: [PATCH 2/3] Update dependencies.yaml to kube-cross v1.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- dependencies.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5cc87440189..2a1cd934b02 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -165,7 +165,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.25.0-go1.19.4-bullseye.0 + version: v1.26.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-]+)*))?)'" @@ -223,7 +223,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (next candidate)" - version: v1.25.0-go1.19.4-bullseye.0 + version: v1.26.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-]+)*))?)'" @@ -322,6 +322,12 @@ dependencies: - path: images/build/go-runner/variants.yaml match: REVISION:\ '\d+' + - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.25)" + 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-]+)*))?)'" + - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)" version: v1.24.0-go1.18.9-bullseye.0 refPaths: From 7a109aadcdae7d2c3a7c53056bdb88d6ba409dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 6 Dec 2022 19:55:48 +0100 Subject: [PATCH 3/3] Bump kube-cross v1.26.0 revision to 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- dependencies.yaml | 4 ++-- images/build/cross/variants.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 2a1cd934b02..172766f1767 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -165,7 +165,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.26.0-go1.19.4-bullseye.0 + version: v1.26.0-go1.19.4-bullseye.1 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-]+)*))?)'" @@ -223,7 +223,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (next candidate)" - version: v1.26.0-go1.19.4-bullseye.0 + version: v1.26.0-go1.19.4-bullseye.1 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/variants.yaml b/images/build/cross/variants.yaml index 2d1f0e484cf..a6f640422c8 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,12 +2,12 @@ variants: v1.26-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.26.0-go1.19.4-bullseye.0' + IMAGE_VERSION: 'v1.26.0-go1.19.4-bullseye.1' KUBERNETES_VERSION: 'v1.26.0' GO_VERSION: '1.19.4' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' - REVISION: '0' + REVISION: '1' PROTOBUF_VERSION: '3.19.4' v1.25-go1.19-bullseye: CONFIG: 'go1.19-bullseye'