From c078600b61d4236128e7b1dab174415f5c10d2e8 Mon Sep 17 00:00:00 2001 From: cpanato Date: Tue, 2 Aug 2022 17:38:10 +0200 Subject: [PATCH] Update Go to 1.17.13 Signed-off-by: cpanato --- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- build/dependencies.yaml | 6 +++--- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index d280e1c4a73..57f272485eb 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.23.0-go1.17.12-bullseye.0 +v1.23.0-go1.17.13-bullseye.0 diff --git a/build/common.sh b/build/common.sh index db93c851578..151b218fbec 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.1.0 -readonly __default_go_runner_version=v2.3.1-go1.17.12-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.17.13-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 c4de4900148..f4a079b6dac 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -87,7 +87,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.17.12 + version: 1.17.13 refPaths: - path: build/build-image/cross/VERSION - path: cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -116,7 +116,7 @@ dependencies: match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.23.0-go1.17.12-bullseye.0 + version: v1.23.0-go1.17.13-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -146,7 +146,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.12-bullseye.0 + version: v2.3.1-go1.17.13-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 20050a9e5ce..fd808a0cec6 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.12 AS builder +FROM golang:1.17.13 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/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index ebf5e60d768..fbdb41e1d10 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.12 +default-go-version: 1.17.13 rules: - destination: code-generator branches: diff --git a/test/images/Makefile b/test/images/Makefile index 3abfda2150f..35726fa4ba5 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.12 +GOLANG_VERSION=1.17.13 export ifndef WHAT