From a73a1754f5d6539438b170cbac97fe21342c1596 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Wed, 6 May 2020 03:36:48 -0400
Subject: [PATCH 1/2] kube-cross: Build v1.14.2-3 and v1.13.9-4 images

Dependency updates:
- PROTOBUF_VERSION to 3.11.4
- ETCD_VERSION to v3.4.7
- SKOPEO_VERSION to v0.2.0

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 images/build/cross/Makefile      |  8 ++++----
 images/build/cross/variants.yaml | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile
index 2da3ef02d4b..a02ea319c5b 100644
--- a/images/build/cross/Makefile
+++ b/images/build/cross/Makefile
@@ -20,13 +20,13 @@ IMAGE=kube-cross
 
 TAG?=$(shell git describe --tags --always --dirty)
 CONFIG?=go1.14
-KUBE_CROSS_VERSION?=v1.14.2-2
+KUBE_CROSS_VERSION?=v1.14.2-3
 
 # Build args
 GO_VERSION?=1.14.2
-PROTOBUF_VERSION?=3.0.2
-ETCD_VERSION?=v3.2.24
-SKOPEO_VERSION?=v0.1.41
+PROTOBUF_VERSION?=3.11.4
+ETCD_VERSION?=v3.4.7
+SKOPEO_VERSION?=v0.2.0
 
 # TODO: Support multi-arch kube-cross images
 #       ref:
diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
index 1836f4e5ad9..fbcfbba5eed 100644
--- a/images/build/cross/variants.yaml
+++ b/images/build/cross/variants.yaml
@@ -2,17 +2,19 @@ variants:
   go1.14:
     CONFIG: 'go1.14'
     GO_VERSION: '1.14.2'
-    KUBE_CROSS_VERSION: 'v1.14.2-2'
-    PROTOBUF_VERSION: '3.0.2'
-    ETCD_VERSION: 'v3.2.24'
-    SKOPEO_VERSION: 'v0.1.41'
+    KUBE_CROSS_VERSION: 'v1.14.2-3'
+    PROTOBUF_VERSION: '3.11.4'
+    ETCD_VERSION: 'v3.4.7'
+    SKOPEO_VERSION: 'v0.2.0'
   go1.13:
     CONFIG: 'go1.13'
     GO_VERSION: '1.13.9'
-    KUBE_CROSS_VERSION: 'v1.13.9-3'
-    PROTOBUF_VERSION: '3.0.2'
-    ETCD_VERSION: 'v3.2.24'
-    SKOPEO_VERSION: 'v0.1.41'
+    KUBE_CROSS_VERSION: 'v1.13.9-4'
+    PROTOBUF_VERSION: '3.11.4'
+    ETCD_VERSION: 'v3.4.7'
+    SKOPEO_VERSION: 'v0.2.0'
+  # DO NOT UPDATE CONFIGS BELOW THIS COMMENT
+  # The following Go versions are out of support
   go1.12:
     CONFIG: 'go1.12'
     GO_VERSION: '1.12.17'

From 3dbc10ecfbb795402c3d94c404e96d2ca131be53 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Wed, 6 May 2020 03:41:02 -0400
Subject: [PATCH 2/2] kube-cross: Zero out substitution values in GCB config

Here we explicitly provide fake values for each of the variables in the
kube-cross GCB config to prevent accidental builds that circumvent the
Makefile or variants.yaml configs.

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 images/build/cross/cloudbuild.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/build/cross/cloudbuild.yaml b/images/build/cross/cloudbuild.yaml
index f8586e6c1b5..957ce7f66c4 100644
--- a/images/build/cross/cloudbuild.yaml
+++ b/images/build/cross/cloudbuild.yaml
@@ -22,12 +22,12 @@ substitutions:
   # can be used as a substitution
   _GIT_TAG: '12345'
   _PULL_BASE_REF: 'dev'
-  _CONFIG: 'go1.14'
-  _GO_VERSION: '1.14.2'
-  _KUBE_CROSS_VERSION: 'v1.14.2-2'
-  _PROTOBUF_VERSION: '3.0.2'
-  _ETCD_VERSION: 'v3.2.24'
-  _SKOPEO_VERSION: 'v0.1.41'
+  _CONFIG: 'go0.0'
+  _GO_VERSION: '0.0.0'
+  _KUBE_CROSS_VERSION: 'v0.0.0-0'
+  _PROTOBUF_VERSION: '0.0.0'
+  _ETCD_VERSION: 'v0.0.0'
+  _SKOPEO_VERSION: 'v0.0.0'
 images:
   - 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_KUBE_CROSS_VERSION'
   - 'gcr.io/$PROJECT_ID/kube-cross-amd64:$_GIT_TAG-$_CONFIG'