diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 0952a065887..5cc1851a5b5 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.15.5-1 +v1.15.7-2 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c76c02f74c8..1ebfbbe518f 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -99,7 +99,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.15.5 + version: 1.15.7 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.5-1 + version: v1.15.7-2 refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Makefile diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index e89ca943cf2..08434886db4 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.5", + go_version = "1.15.7", minimum_bazel_version = "3.4.1", ) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index 35bf1181eab..0ca3950c685 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.5 AS builder +FROM golang:1.15.7 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 cae537e9390..8d6579e1a2a 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.5 +GOLANG_VERSION=1.15.7 export ifndef WHAT diff --git a/test/images/sample-apiserver/Makefile b/test/images/sample-apiserver/Makefile index f3bca3307f5..2fde7e4b2fb 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 -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.5-1 \ + docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:v1.15.7-2 \ /bin/bash -c "\ mkdir -p /go/src /go/bin && \ GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \