From 8dc4509e7d6a224c68201c83d2a5225b7670f169 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Thu, 18 Mar 2021 17:41:53 +0100 Subject: [PATCH] Update to go1.15.10 --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 6 +++--- build/root/WORKSPACE | 2 +- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- test/images/Makefile | 2 +- test/images/sample-apiserver/Makefile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 12e06ba5cac8b..8ab5fb6676661 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.15.8-legacy-1 +v1.15.10-legacy-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 79ae7a0ab2d82..e9276e537a835 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -99,7 +99,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.15.8 + version: 1.15.10 refPaths: - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE @@ -112,7 +112,7 @@ dependencies: match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?' - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.15.8-legacy-1 + version: v1.15.10-legacy-1 refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Makefile @@ -146,7 +146,7 @@ dependencies: match: configs\[DebianIptables\] = Config{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: buster-v2.3.1 + version: v2.3.1-go1.15.10-buster.0 refPaths: - path: build/common.sh match: go_runner_version= diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index c222f30b15aa7..c447435229972 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -23,7 +23,7 @@ load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_ # 'override_go_version': used to specify an alternate go version provided # by kubernetes/repo-infra repo_infra_configure( - go_version = "1.15.8", + go_version = "1.15.10", minimum_bazel_version = "2.2.0", ) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 0ba4802acc073..463ddf68cde1a 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.15.8 AS builder +FROM golang:1.15.10 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/test/images/Makefile b/test/images/Makefile index 460c51da2b549..31973ff734f28 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.15.8 +GOLANG_VERSION=1.15.10 export ifndef WHAT diff --git a/test/images/sample-apiserver/Makefile b/test/images/sample-apiserver/Makefile index e6b6ca9b935a3..540a3e2f266e3 100644 --- a/test/images/sample-apiserver/Makefile +++ b/test/images/sample-apiserver/Makefile @@ -24,7 +24,7 @@ export # Get without building to populate module cache # Then, get with OS/ARCH-specific env to build bin: - docker run --rm -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.8-legacy-1 \ + docker run --rm -it -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.10-legacy-1 \ /bin/bash -c "\ mkdir -p /go/src /go/bin && \ GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \