From 15b714555629eb3d9a5a8e66b6537d9095a8d173 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 27 Jul 2022 09:49:25 +0200 Subject: [PATCH 1/2] build Go 1.18.4 and 1.17.12 images Signed-off-by: cpanato --- Dockerfile-kubepkg | 2 +- Dockerfile-kubepkg-rpm | 2 +- dependencies.yaml | 20 ++++++++++---------- images/build/cross/Makefile | 4 ++-- 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, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index e39ebdc9ebd..ffea60e444b 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.3-buster AS builder +FROM golang:1.18.4-buster AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index 7046b43ba5a..6e429262122 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.3-buster AS builder +FROM golang:1.18.4-buster AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index 44e49139012..838a6c44ab3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -53,7 +53,7 @@ dependencies: # Golang - name: "golang" - version: 1.18.3 + version: 1.18.4 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -127,7 +127,7 @@ dependencies: # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not - name: "Kubernetes version (stable.0)" - version: v1.23.0 + version: v1.24.0 refPaths: - path: images/build/cross/Makefile match: KUBERNETES_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -147,7 +147,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner" - version: v2.3.1-go1.17.11-bullseye.0 + version: v2.3.1-go1.17.12-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.3-bullseye.0 + version: v1.25.0-go1.18.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-]+)*))?)'" @@ -238,7 +238,7 @@ dependencies: # Golang (previous release branches: 1.24) - name: "golang (previous release branches: 1.24)" - version: 1.18.3 + version: 1.18.4 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.11 + version: 1.17.12 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.3-bullseye.0 + version: v2.3.1-go1.18.4-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.11-bullseye.0 + version: v2.3.1-go1.17.12-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.3-bullseye.0 + version: v1.24.0-go1.18.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.23)" - version: v1.23.0-go1.17.11-bullseye.0 + version: v1.23.0-go1.17.12-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 fe050f8b39e..0db7934b94d 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -27,8 +27,8 @@ IMGNAME = kube-cross # Example: # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not -KUBERNETES_VERSION ?= v1.23.0 -GO_VERSION ?= 1.18.3 +KUBERNETES_VERSION ?= v1.24.0 +GO_VERSION ?= 1.18.4 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 17c217c1add..54091966008 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.3-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.18.4-bullseye.0' KUBERNETES_VERSION: 'v1.25.0' - GO_VERSION: '1.18.3' + GO_VERSION: '1.18.4' 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.3-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.18.4-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.18.3' + GO_VERSION: '1.18.4' 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.11-bullseye.0' + IMAGE_VERSION: 'v1.23.0-go1.17.12-bullseye.0' KUBERNETES_VERSION: 'v1.23.0' - GO_VERSION: '1.17.11' + GO_VERSION: '1.17.12' 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 51d01f5cbbd..3cbdd2d8aec 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.3 +GO_VERSION ?= 1.18.4 OS_CODENAME ?= bullseye DISTROLESS_IMAGE ?= static-debian11 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index a70f74cf8d0..7bef9bbd3f3 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.3-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.18.4-bullseye.0' GO_MAJOR_VERSION: '1.18' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.18.3' + GO_VERSION: '1.18.4' DISTROLESS_IMAGE: 'static-debian11' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.17.11-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.17.12-bullseye.0' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.17.11' + GO_VERSION: '1.17.12' 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 ea70c4b2835..e5f33825eef 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.3' + GO_VERSION: '1.18.4' OS_CODENAME: 'bullseye' REVISION: '0' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - GO_VERSION: '1.17.11' + GO_VERSION: '1.17.12' OS_CODENAME: 'bullseye' REVISION: '0' go1.16-buster: diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index 6d751db6f35..b7b295e404f 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.3-bullseye +FROM golang:1.18.4-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \ From fa9b37c2066ba8b39a7d01e17f9b2a8d2daf665f Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 27 Jul 2022 09:49:53 +0200 Subject: [PATCH 2/2] drop images for 1.21 k8s due to eol Signed-off-by: cpanato --- dependencies.yaml | 8 +------- images/build/cross/variants.yaml | 10 ---------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 838a6c44ab3..52e654a17f0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -336,13 +336,7 @@ dependencies: - 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.21)" - version: v1.21.0-go1.16.15-buster.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: config variant (previous release branches: 1.22, 1.21)" + - name: "k8s.gcr.io/build-image/kube-cross: config variant (previous release branches: 1.22)" version: go1.16-buster refPaths: - path: images/build/cross/variants.yaml diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 54091966008..4f4155cb924 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -49,13 +49,3 @@ variants: OS_CODENAME: 'buster' REVISION: '0' PROTOBUF_VERSION: '3.19.4' - v1.21-go1.16-buster: - CONFIG: 'go1.16-buster' - TYPE: 'default' - IMAGE_VERSION: 'v1.21.0-go1.16.15-buster.0' - KUBERNETES_VERSION: 'v1.21.0' - GO_VERSION: '1.16.15' - GO_MAJOR_VERSION: '1.16' - OS_CODENAME: 'buster' - REVISION: '0' - PROTOBUF_VERSION: '3.19.4'