From a4a98f440cea4fea7751f7eee377350a72669426 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Wed, 2 Sep 2020 17:59:40 -0400
Subject: [PATCH] [go1.15] Update to go1.15.2

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 build/build-image/cross/VERSION         | 2 +-
 build/dependencies.yaml                 | 4 ++--
 build/root/WORKSPACE                    | 2 +-
 test/images/Makefile                    | 2 +-
 test/images/sample-apiserver/Dockerfile | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index c2f3f74f20d..eb2573a06ea 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.15.0-1
+v1.15.2-1
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 9a4a8763cae..1ba43a61bf7 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -99,7 +99,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.15
+    version: 1.15.2
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: build/root/WORKSPACE
@@ -108,7 +108,7 @@ dependencies:
       match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
 
   - name: "k8s.gcr.io/kube-cross: dependents"
-    version: v1.15.0-1
+    version: v1.15.2-1
     refPaths:
     - path: build/build-image/cross/VERSION
     - path: test/images/sample-apiserver/Dockerfile
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 6f4832aa3a7..a21731eaf3d 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",
+    go_version = "1.15.2",
     minimum_bazel_version = "2.2.0",
 )
 
diff --git a/test/images/Makefile b/test/images/Makefile
index 6dd1ef8260e..7b9981cb19e 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=v2.9.1
-GOLANG_VERSION=1.15.0
+GOLANG_VERSION=1.15.2
 export
 
 ifndef WHAT
diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile
index a1c3fa69ca6..dbec210d46d 100644
--- a/test/images/sample-apiserver/Dockerfile
+++ b/test/images/sample-apiserver/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASEIMAGE
-FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-1 as build_k8s_1_17_sample_apiserver
+FROM k8s.gcr.io/build-image/kube-cross:v1.15.2-1 as build_k8s_1_17_sample_apiserver
 
 ENV GOPATH /go
 RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin