diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index fcb3971dc01..f54e31c8680 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.23.0-go1.17.1-bullseye.1 +v1.23.0-go1.17.2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index a9f3073aaa3..770769f3a17 100755 --- a/build/common.sh +++ b/build/common.sh @@ -91,7 +91,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_debian_iptables_version=bullseye-v1.0.0 -readonly __default_go_runner_version=v2.3.1-go1.17.1-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.17.2-bullseye.0 readonly __default_setcap_version=bullseye-v1.0.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c73dd9e7679..c5cbcd2099f 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -85,7 +85,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.17.1 + version: 1.17.2 refPaths: - path: build/build-image/cross/VERSION - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -108,13 +108,13 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "golang: etcd release version" - version: 1.16.8 + version: 1.16.9 refPaths: - path: cluster/images/etcd/Makefile match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.23.0-go1.17.1-bullseye.1 + version: v1.23.0-go1.17.2-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -144,7 +144,7 @@ dependencies: match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-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/go-runner: dependents" - version: v2.3.1-go1.17.1-bullseye.0 + version: v2.3.1-go1.17.2-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 4390431f548..1d7828a7f7a 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17.1 AS builder +FROM golang:1.17.2 AS builder COPY elasticsearch_logging_discovery.go go.mod go.sum / RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 79c44d991e7..41eb5970ad6 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -62,7 +62,7 @@ endif # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled # golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases. -GOLANG_VERSION?=1.16.8 +GOLANG_VERSION?=1.16.9 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 3ff0861b343..552a87c8e86 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -7,7 +7,7 @@ recursive-delete-patterns: - BUILD.bazel - "*/BUILD.bazel" - Gopkg.toml -default-go-version: 1.17.1 +default-go-version: 1.17.2 rules: - destination: code-generator branches: diff --git a/test/images/Makefile b/test/images/Makefile index e454d0df667..3aa152e825a 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= k8s.gcr.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.17.1 +GOLANG_VERSION=1.17.2 export ifndef WHAT