From 109b20d29ca848bd11e30979e096460bfd525aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20Garc=C3=ADa=20Veytia=20=28Puerco=29?=
 <adolfo.garcia@uservers.net>
Date: Thu, 4 Feb 2021 21:14:41 -0600
Subject: [PATCH] Build kubecross:v1.15.8-1 (golang 1.15.8)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Adolfo García Veytia (Puerco) <adolfo.garcia@uservers.net>
---
 dependencies.yaml                      | 8 ++++----
 images/build/cross/Makefile            | 6 +++---
 images/build/cross/variants.yaml       | 8 ++++----
 images/k8s-cloud-builder/variants.yaml | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 4c2167249e6..7b447cf692f 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -57,7 +57,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.16rc1
+    version: 1.15.8
     refPaths:
     - path: cmd/vulndash/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -103,13 +103,13 @@ dependencies:
       match: 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/build-image/kube-cross"
-    version: v1.16.0-rc.1-1
+    version: v1.15.8-1
     refPaths:
     - path: images/build/cross/variants.yaml
       match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+
 
   - name: "k8s.gcr.io/build-image/kube-cross: config variant"
-    version: go1.16
+    version: go1.15
     refPaths:
     - path: images/build/cross/Makefile
       match: CONFIG \?= go\d+.\d+
@@ -117,7 +117,7 @@ dependencies:
       match: go\d+.\d+
 
   - name: "k8s.gcr.io/build-image/kube-cross: dependents"
-    version: v1.15.7-2
+    version: v1.15.8-1
     refPaths:
     - path: images/k8s-cloud-builder/variants.yaml
       match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-\d+
diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile
index 1b722f80c07..81d7d830a16 100644
--- a/images/build/cross/Makefile
+++ b/images/build/cross/Makefile
@@ -16,11 +16,11 @@
 include $(CURDIR)/../../Makefile.common-image $(CURDIR)/../Makefile.build-image
 
 IMGNAME = kube-cross
-IMAGE_VERSION ?= v1.16.0-rc.1-1
-CONFIG ?= go1.16
+IMAGE_VERSION ?= v1.15.8-1
+CONFIG ?= go1.15
 
 # Build args
-GO_VERSION?=1.16rc1
+GO_VERSION?=1.15.8
 PROTOBUF_VERSION?=3.7.0
 ETCD_VERSION?=v3.4.13
 
diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
index 8d1b67bdda5..af75e39b0a0 100644
--- a/images/build/cross/variants.yaml
+++ b/images/build/cross/variants.yaml
@@ -1,8 +1,8 @@
 variants:
   canary:
     CONFIG: 'canary'
-    GO_VERSION: '1.16rc1'
-    IMAGE_VERSION: 'v1.16.0-rc.1-canary-1'
+    GO_VERSION: '1.15.8'
+    IMAGE_VERSION: 'v1.15.8-canary-1'
     PROTOBUF_VERSION: '3.7.0'
     ETCD_VERSION: 'v3.4.13'
   go1.16:
@@ -13,7 +13,7 @@ variants:
     ETCD_VERSION: 'v3.4.13'
   go1.15:
     CONFIG: 'go1.15'
-    GO_VERSION: '1.15.7'
-    IMAGE_VERSION: 'v1.15.7-2'
+    GO_VERSION: '1.15.8'
+    IMAGE_VERSION: 'v1.15.8-1'
     PROTOBUF_VERSION: '3.7.0'
     ETCD_VERSION: 'v3.4.13'
diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml
index f4c890d3698..24c2cf508cc 100644
--- a/images/k8s-cloud-builder/variants.yaml
+++ b/images/k8s-cloud-builder/variants.yaml
@@ -1,5 +1,5 @@
 variants:
   cross1.15:
     CONFIG: 'cross1.15'
-    KUBE_CROSS_VERSION: 'v1.15.7-2'
+    KUBE_CROSS_VERSION: 'v1.15.8-1'
     SKOPEO_VERSION: 'v1.2.0'