Merge pull request #3154 from xmudrii/go1206

Build Go 1.20.6 images and remove references to Go 1.19

Dockerfile-kubepkg

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.5-bullseye AS builder
+FROM golang:1.20.6-bullseye AS builder
 
 ENV GO111MODULE=on
 

Dockerfile-kubepkg-rpm

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.5-bullseye AS builder
+FROM golang:1.20.6-bullseye AS builder
 
 ENV GO111MODULE=on
 

dependencies.yaml

@@ -57,7 +57,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.20.5
+    version: 1.20.6
     refPaths:
     - path: Dockerfile-kubepkg
       match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
@@ -166,7 +166,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)"
-    version: v2.3.1-go1.20.5-bullseye.0
+    version: v2.3.1-go1.20.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-]+)*))?)
@@ -179,13 +179,7 @@ dependencies:
     - path: images/build/go-runner/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/go-runner (go1.19-bullseye)"
-    version: v2.3.1-go1.19.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: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bullseye)"
+  - name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)"
     version: 0
     refPaths:
     - path: images/build/go-runner/Makefile
@@ -215,7 +209,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
-    version: v1.27.0-go1.20.5-bullseye.0
+    version: v1.27.0-go1.20.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-]+)*))?)'"
@@ -235,7 +229,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.20)"
-    version: v1.26.0-go1.20.5-bullseye.0
+    version: v1.26.0-go1.20.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-]+)*))?)'"
@@ -254,8 +248,8 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.19)"
-    version: v1.25.0-go1.20.5-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.20)"
+    version: v1.25.0-go1.20.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-]+)*))?)'"
@@ -274,19 +268,19 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "registry.k8s.io/build-image/kube-cross (v1.24-go1.19)"
-    version: v1.24.0-go1.20.5-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.24-go1.20)"
+    version: v1.24.0-go1.20.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-]+)*))?)'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.24-go1.19)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.24-go1.20)"
     version: go1.20-bullseye
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "CONFIG: 'go\\d+.\\d+-bullseye'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.24-go1.19)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.24-go1.20)"
     version: 0
     refPaths:
     - path: images/build/cross/Makefile
@@ -346,7 +340,7 @@ dependencies:
 
   # Golang (previous release branches: 1.26)
   - name: "golang (previous release branches: 1.26)"
-    version: 1.20.5
+    version: 1.20.6
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -363,7 +357,7 @@ dependencies:
 
   # Golang (previous release branches: 1.25)
   - name: "golang (previous release branches: 1.25)"
-    version: 1.20.5
+    version: 1.20.6
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -380,7 +374,7 @@ dependencies:
 
   # Golang (previous release branches: 1.24)
   - name: "golang (previous release branches: 1.24)"
-    version: 1.20.5
+    version: 1.20.6
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

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.27.0
-GO_VERSION ?= 1.20.5
+GO_VERSION ?= 1.20.6
 GO_MAJOR_VERSION ?= 1.20
 OS_CODENAME ?= bullseye
 REVISION ?= 0

images/build/cross/variants.yaml

@@ -12,39 +12,39 @@ variants:
   v1.27-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.27.0-go1.20.5-bullseye.0'
+    IMAGE_VERSION: 'v1.27.0-go1.20.6-bullseye.0'
     KUBERNETES_VERSION: 'v1.27.0'
-    GO_VERSION: '1.20.5'
+    GO_VERSION: '1.20.6'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
   v1.26-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.26.0-go1.20.5-bullseye.0'
+    IMAGE_VERSION: 'v1.26.0-go1.20.6-bullseye.0'
     KUBERNETES_VERSION: 'v1.26.0'
-    GO_VERSION: '1.20.5'
+    GO_VERSION: '1.20.6'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
   v1.25-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.25.0-go1.20.5-bullseye.0'
+    IMAGE_VERSION: 'v1.25.0-go1.20.6-bullseye.0'
     KUBERNETES_VERSION: 'v1.25.0'
-    GO_VERSION: '1.20.5'
+    GO_VERSION: '1.20.6'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
   v1.24-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.24.0-go1.20.5-bullseye.0'
+    IMAGE_VERSION: 'v1.24.0-go1.20.6-bullseye.0'
     KUBERNETES_VERSION: 'v1.24.0'
-    GO_VERSION: '1.20.5'
+    GO_VERSION: '1.20.6'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'

images/build/go-runner/Makefile

@@ -19,7 +19,7 @@ IMGNAME = go-runner
 APP_VERSION = $(shell cat VERSION)
 GO_MAJOR_VERSION ?= 1.20
 REVISION ?= 0
-GO_VERSION ?= 1.20.5
+GO_VERSION ?= 1.20.6
 OS_CODENAME ?= bullseye
 
 # Build args

images/build/go-runner/variants.yaml

@@ -9,17 +9,9 @@ variants:
     DISTROLESS_IMAGE: 'static-debian11'
   go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.20.5-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.20.6-bullseye.0'
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.20.5'
-    DISTROLESS_IMAGE: 'static-debian11'
-  go1.19-bullseye:
-    CONFIG: 'go1.19-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.19.10-bullseye.0'
-    GO_MAJOR_VERSION: '1.19'
-    OS_CODENAME: 'bullseye'
-    REVISION: '0'
-    GO_VERSION: '1.19.10'
+    GO_VERSION: '1.20.6'
     DISTROLESS_IMAGE: 'static-debian11'

images/releng/ci/variants.yaml

@@ -6,11 +6,6 @@ variants:
     REVISION: '0'
   go1.20-bookworm:
     CONFIG: 'go1.20-bookworm'
-    GO_VERSION: '1.20.5'
-    OS_CODENAME: 'bookworm'
-    REVISION: '0'
-  go1.19-bookworm:
-    CONFIG: 'go1.19-bookworm'
-    GO_VERSION: '1.19.10'
+    GO_VERSION: '1.20.6'
     OS_CODENAME: 'bookworm'
     REVISION: '0'

packages/deb/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.5-bullseye
+FROM golang:1.20.6-bullseye
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \