diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index 2b395f61bbf..7073de9e6dd 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.17.5-buster AS builder +FROM golang:1.17.6-buster AS builder ENV GO111MODULE=on diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index 7e25fde6953..d5711f6d4e2 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.17.5-buster AS builder +FROM golang:1.17.6-buster AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index b180afedc65..06fc149d4c4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -53,7 +53,7 @@ dependencies: # Golang - name: "golang" - version: 1.17.5 + version: 1.17.6 refPaths: - path: Dockerfile-kubepkg match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder @@ -147,7 +147,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner" - version: v2.3.1-go1.17.5-bullseye.0 + version: v2.3.1-go1.17.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-]+)*))?) @@ -161,7 +161,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.24.0-go1.17.5-bullseye.0 + version: v1.24.0-go1.17.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-]+)*))?)'" @@ -238,7 +238,7 @@ dependencies: # Golang (previous release branches: 1.22, 1.21) - name: "golang (previous release branches: 1.22, 1.21)" - version: 1.16.12 + version: 1.16.13 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -268,7 +268,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.22, 1.21)" - version: v2.3.1-go1.16.12-buster.0 + version: v2.3.1-go1.16.13-buster.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-]+)*))?) @@ -284,19 +284,19 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.23)" - version: v1.23.0-go1.17.5-bullseye.0 + version: v1.23.0-go1.17.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: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.22)" - version: v1.22.0-go1.16.12-buster.0 + version: v1.22.0-go1.16.13-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 (previous release branches: 1.21)" - version: v1.21.0-go1.16.12-buster.0 + version: v1.21.0-go1.16.13-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-]+)*))?)'" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index d91b763d90c..73b72206d18 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.23.0 -GO_VERSION ?= 1.17.5 +GO_VERSION ?= 1.17.6 GO_MAJOR_VERSION ?= 1.17 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 78f21e8fe10..51af393796d 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -12,9 +12,9 @@ variants: v1.24-go1.17-bullseye: CONFIG: 'go1.17-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.17.5-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.17.6-bullseye.0' KUBERNETES_VERSION: 'v1.24.0' - GO_VERSION: '1.17.5' + GO_VERSION: '1.17.6' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' @@ -22,9 +22,9 @@ variants: v1.23-go1.17-bullseye: CONFIG: 'go1.17-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.23.0-go1.17.5-bullseye.0' + IMAGE_VERSION: 'v1.23.0-go1.17.6-bullseye.0' KUBERNETES_VERSION: 'v1.23.0' - GO_VERSION: '1.17.5' + GO_VERSION: '1.17.6' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' @@ -32,9 +32,9 @@ variants: v1.22-go1.16-buster: CONFIG: 'go1.16-buster' TYPE: 'default' - IMAGE_VERSION: 'v1.22.0-go1.16.12-buster.0' + IMAGE_VERSION: 'v1.22.0-go1.16.13-buster.0' KUBERNETES_VERSION: 'v1.22.0' - GO_VERSION: '1.16.12' + GO_VERSION: '1.16.13' GO_MAJOR_VERSION: '1.16' OS_CODENAME: 'buster' REVISION: '0' @@ -42,9 +42,9 @@ variants: v1.21-go1.16-buster: CONFIG: 'go1.16-buster' TYPE: 'default' - IMAGE_VERSION: 'v1.21.0-go1.16.12-buster.0' + IMAGE_VERSION: 'v1.21.0-go1.16.13-buster.0' KUBERNETES_VERSION: 'v1.21.0' - GO_VERSION: '1.16.12' + GO_VERSION: '1.16.13' GO_MAJOR_VERSION: '1.16' OS_CODENAME: 'buster' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 568ad87de76..14c38dc4197 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.17 REVISION ?= 0 # Build args -GO_VERSION ?= 1.17.5 +GO_VERSION ?= 1.17.6 OS_CODENAME ?= bullseye DISTROLESS_IMAGE ?= static-debian11 diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index f4b32b6530d..32d8e9c20ab 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -9,17 +9,17 @@ variants: DISTROLESS_IMAGE: 'static-debian11' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.17.5-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.17.6-bullseye.0' GO_MAJOR_VERSION: '1.17' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.17.5' + GO_VERSION: '1.17.6' DISTROLESS_IMAGE: 'static-debian11' go1.16-buster: CONFIG: 'go1.16-buster' - IMAGE_VERSION: 'v2.3.1-go1.16.12-buster.0' + IMAGE_VERSION: 'v2.3.1-go1.16.13-buster.0' GO_MAJOR_VERSION: '1.16' OS_CODENAME: 'buster' REVISION: '0' - GO_VERSION: '1.16.12' + GO_VERSION: '1.16.13' DISTROLESS_IMAGE: 'static-debian10' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 51fce8c6435..5865ef4e40d 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -6,11 +6,11 @@ variants: REVISION: '0' go1.17-bullseye: CONFIG: 'go1.17-bullseye' - GO_VERSION: '1.17.5' + GO_VERSION: '1.17.6' OS_CODENAME: 'bullseye' REVISION: '0' go1.16-buster: CONFIG: 'go1.16-buster' - GO_VERSION: '1.16.12' + GO_VERSION: '1.16.13' OS_CODENAME: 'buster' REVISION: '0' diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index f3715917efe..e25e1e916ed 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.17.5-bullseye +FROM golang:1.17.6-bullseye RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \