From dd94bac7fddd2bf19bbe4b69b6ea44020c9e1304 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 15 Feb 2023 10:35:52 +0100 Subject: [PATCH 1/2] drop go1.18 and go1.17 configs Signed-off-by: cpanato --- dependencies.yaml | 34 ---------------------------- images/build/cross/variants.yaml | 10 -------- images/build/go-runner/variants.yaml | 8 ------- images/releng/ci/variants.yaml | 10 -------- 4 files changed, 62 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index de3ddf5dddd..ecd1ec4fe80 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -179,20 +179,6 @@ dependencies: - path: images/build/go-runner/variants.yaml match: REVISION:\ '\d+' - - name: "k8s.gcr.io/build-image/go-runner (go1.18-bullseye)" - version: v2.3.1-go1.18.10-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: image revision (go1.18-bullseye)" - version: 0 - refPaths: - - path: images/build/go-runner/Makefile - match: REVISION \?= \d+ - - path: images/build/go-runner/variants.yaml - match: REVISION:\ '\d+' - # kube-cross - name: "k8s.gcr.io/build-image/kube-cross (v1.27-go1.20)" version: v1.27.0-go1.20-bullseye.0 @@ -274,26 +260,6 @@ dependencies: - path: images/build/cross/variants.yaml match: REVISION:\ '\d+' - - name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.18)" - version: v1.24.0-go1.18.10-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: config variant (v1.24-go1.18)" - version: go1.18-bullseye - refPaths: - - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" - - - name: "k8s.gcr.io/build-image/kube-cross: image revision (v1.24-go1.18)" - version: 0 - refPaths: - - path: images/build/cross/Makefile - match: REVISION \?= \d+ - - path: images/build/cross/variants.yaml - match: REVISION:\ '\d+' - - name: "k8s.gcr.io/build-image/kube-cross (v1.23-go1.19)" version: v1.23.0-go1.19.5-bullseye.0 refPaths: diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 6bbc81dcaec..ea6f97faccf 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -39,16 +39,6 @@ variants: OS_CODENAME: 'bullseye' REVISION: '0' PROTOBUF_VERSION: '3.19.4' - v1.24-go1.18-bullseye: - CONFIG: 'go1.18-bullseye' - TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.18.10-bullseye.0' - KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.18.10' - GO_MAJOR_VERSION: '1.18' - OS_CODENAME: 'bullseye' - REVISION: '0' - PROTOBUF_VERSION: '3.19.4' v1.23-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 5f338e2a866..2b6d361b205 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -15,11 +15,3 @@ variants: REVISION: '0' GO_VERSION: '1.19.5' DISTROLESS_IMAGE: 'static-debian11' - go1.18-bullseye: - CONFIG: 'go1.18-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.18.10-bullseye.0' - GO_MAJOR_VERSION: '1.18' - OS_CODENAME: 'bullseye' - REVISION: '0' - GO_VERSION: '1.18.10' - DISTROLESS_IMAGE: 'static-debian11' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index a4f4d7a6b7b..1da52535cdd 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -9,13 +9,3 @@ variants: GO_VERSION: '1.19.5' OS_CODENAME: 'bullseye' REVISION: '0' - go1.18-bullseye: - CONFIG: 'go1.18-bullseye' - GO_VERSION: '1.18.10' - OS_CODENAME: 'bullseye' - REVISION: '0' - go1.17-bullseye: - CONFIG: 'go1.17-bullseye' - GO_VERSION: '1.17.13' - OS_CODENAME: 'bullseye' - REVISION: '0' From 4368f5f0aeb127bdae609af9e84f2a29e9f1cff4 Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 15 Feb 2023 10:36:23 +0100 Subject: [PATCH 2/2] Build Go 1.20.1 and 1.19.6 based images Signed-off-by: cpanato --- Dockerfile-kubepkg | 2 +- Dockerfile-kubepkg-rpm | 2 +- dependencies.yaml | 26 +++++++++++++------------- images/build/cross/Makefile | 6 +++--- images/build/cross/variants.yaml | 20 ++++++++++---------- images/build/go-runner/Makefile | 4 ++-- images/build/go-runner/variants.yaml | 8 ++++---- images/releng/ci/variants.yaml | 4 ++-- packages/deb/Dockerfile | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index 93b6395c8bd..4165e28fb44 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.5-bullseye AS builder +FROM golang:1.20.1-bullseye AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index cf383f27fea..e756c53b2a8 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.5-bullseye AS builder +FROM golang:1.20.1-bullseye AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index ecd1ec4fe80..a8d31521ac2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -57,7 +57,7 @@ dependencies: # Golang - name: "golang" - version: 1.19.5 + version: 1.20.1 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -82,7 +82,7 @@ dependencies: # This entry is a stub of the major version to allow dependency checks to # pass when building Kubernetes using a pre-release of Golang. - name: "golang: 1." - version: 1.19 + version: 1.20 refPaths: - path: images/build/cross/Makefile match: GO_MAJOR_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -131,7 +131,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.26.0 + version: v1.27.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-]+)*))?) @@ -139,7 +139,7 @@ dependencies: 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-]+)*))?)'" - name: "Kubernetes version (next candidate.0)" - version: v1.26.0 + version: v1.27.0 refPaths: - path: images/build/cross/variants.yaml 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-]+)*))?)'" @@ -152,7 +152,7 @@ dependencies: # go-runner - name: "k8s.gcr.io/build-image/go-runner (go1.20-bullseye)" - version: v2.3.1-go1.20-bullseye.0 + version: v2.3.1-go1.20.1-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-]+)*))?) @@ -166,7 +166,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (go1.19-bullseye)" - version: v2.3.1-go1.19.5-bullseye.0 + version: v2.3.1-go1.19.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-]+)*))?) @@ -181,7 +181,7 @@ dependencies: # kube-cross - name: "k8s.gcr.io/build-image/kube-cross (v1.27-go1.20)" - version: v1.27.0-go1.20-bullseye.0 + version: v1.27.0-go1.20.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-]+)*))?)'" @@ -201,7 +201,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (v1.26-go1.19)" - version: v1.26.0-go1.19.5-bullseye.0 + version: v1.26.0-go1.19.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-]+)*))?)'" @@ -221,7 +221,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (v1.25-go1.19)" - version: v1.25.0-go1.19.5-bullseye.0 + version: v1.25.0-go1.19.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-]+)*))?)'" @@ -241,7 +241,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (v1.24-go1.19)" - version: v1.24.0-go1.19.5-bullseye.0 + version: v1.24.0-go1.19.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-]+)*))?)'" @@ -261,7 +261,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (v1.23-go1.19)" - version: v1.23.0-go1.19.5-bullseye.0 + version: v1.23.0-go1.19.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-]+)*))?)'" @@ -338,7 +338,7 @@ dependencies: # Golang (previous release branches: 1.24) - name: "golang (previous release branches: 1.24)" - version: 1.19.5 + version: 1.19.6 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -355,7 +355,7 @@ dependencies: # Golang (previous release branches: 1.23) - name: "golang (previous release branches: 1.23)" - version: 1.19.5 + version: 1.19.6 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index 0e1f54e725d..ec4454ac5dd 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -27,9 +27,9 @@ 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.26.0 -GO_VERSION ?= 1.19.5 -GO_MAJOR_VERSION ?= 1.19 +KUBERNETES_VERSION ?= v1.27.0 +GO_VERSION ?= 1.20.1 +GO_MAJOR_VERSION ?= 1.20 OS_CODENAME ?= bullseye REVISION ?= 0 TYPE ?= default diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index ea6f97faccf..8636990c734 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,9 +2,9 @@ variants: v1.27-go1.20-bullseye: CONFIG: 'go1.20-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.27.0-go1.20-bullseye.0' + IMAGE_VERSION: 'v1.27.0-go1.20.1-bullseye.0' KUBERNETES_VERSION: 'v1.27.0' - GO_VERSION: '1.20' + GO_VERSION: '1.20.1' GO_MAJOR_VERSION: '1.20' OS_CODENAME: 'bullseye' REVISION: '0' @@ -12,9 +12,9 @@ variants: v1.26-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.26.0-go1.19.5-bullseye.0' + IMAGE_VERSION: 'v1.26.0-go1.19.6-bullseye.0' KUBERNETES_VERSION: 'v1.26.0' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' @@ -22,9 +22,9 @@ variants: v1.25-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.25.0-go1.19.5-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.19.6-bullseye.0' KUBERNETES_VERSION: 'v1.25.0' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' @@ -32,9 +32,9 @@ variants: v1.24-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.19.5-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.19.6-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' @@ -42,9 +42,9 @@ variants: v1.23-go1.19-bullseye: CONFIG: 'go1.19-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.23.0-go1.19.5-bullseye.0' + IMAGE_VERSION: 'v1.23.0-go1.19.6-bullseye.0' KUBERNETES_VERSION: 'v1.23.0' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index d30eff7cb13..cb7d9dc3930 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -17,9 +17,9 @@ include $(CURDIR)/../../Makefile.common-image IMGNAME = go-runner APP_VERSION = $(shell cat VERSION) -GO_MAJOR_VERSION ?= 1.19 +GO_MAJOR_VERSION ?= 1.20 REVISION ?= 0 -GO_VERSION ?= 1.19.5 +GO_VERSION ?= 1.20.1 OS_CODENAME ?= bullseye # Build args diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 2b6d361b205..c7442c47fe1 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,17 +1,17 @@ variants: go1.20-bullseye: CONFIG: 'go1.20-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.20-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.20.1-bullseye.0' GO_MAJOR_VERSION: '1.20' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.20' + GO_VERSION: '1.20.1' DISTROLESS_IMAGE: 'static-debian11' go1.19-bullseye: CONFIG: 'go1.19-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.19.5-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.19.6-bullseye.0' GO_MAJOR_VERSION: '1.19' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' DISTROLESS_IMAGE: 'static-debian11' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 1da52535cdd..2fac631ec8b 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,11 +1,11 @@ variants: go1.20-bullseye: CONFIG: 'go1.20-bullseye' - GO_VERSION: '1.20' + GO_VERSION: '1.20.1' OS_CODENAME: 'bullseye' REVISION: '0' go1.19-bullseye: CONFIG: 'go1.19-bullseye' - GO_VERSION: '1.19.5' + GO_VERSION: '1.19.6' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index 3fde5c34d25..e6ac94761cb 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.5-bullseye +FROM golang:1.20.1-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \