From b53958342d6ce60c83727d8d93dd345fa9962e88 Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Fri, 26 Mar 2021 18:29:45 +0000
Subject: [PATCH] pause image: Uses kube-cross image to build windows binaries

kube-cross:v1.16.3-1 contains x86_64-w64-mingw32, which will allow us to
build Windows binaries. With this, we won't have to rely on the dockerhub
image dockcross/windows-static-x64.
---
 build/dependencies.yaml |  2 +-
 build/pause/Makefile    | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index e723717b078..449f7dea05f 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -160,7 +160,7 @@ dependencies:
       match: __default_go_runner_version=
 
   - name: "k8s.gcr.io/pause"
-    version: 3.5
+    version: 3.6
     refPaths:
     - path: build/pause/Makefile
       match: TAG =
diff --git a/build/pause/Makefile b/build/pause/Makefile
index 43f49e9d868..422c5e23949 100644
--- a/build/pause/Makefile
+++ b/build/pause/Makefile
@@ -17,7 +17,7 @@
 REGISTRY ?= staging-k8s.gcr.io
 IMAGE = $(REGISTRY)/pause
 
-TAG = 3.5
+TAG = 3.6
 REV = $(shell git describe --contains --always --match='v*')
 
 # Architectures supported: amd64, arm, arm64, ppc64le and s390x
@@ -40,12 +40,8 @@ ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion,
 ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})
 
 CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV)
-KUBE_CROSS_IMAGE.linux ?= k8s.gcr.io/build-image/kube-cross
-KUBE_CROSS_VERSION.linux ?= $(shell cat ../build-image/cross/VERSION)
-KUBE_CROSS_IMAGE.windows ?= dockcross/windows-static-x64
-KUBE_CROSS_VERSION.windows ?= latest
-KUBE_CROSS_IMAGE := ${KUBE_CROSS_IMAGE.${OS}}
-KUBE_CROSS_VERSION := ${KUBE_CROSS_VERSION.${OS}}
+KUBE_CROSS_IMAGE ?= k8s.gcr.io/build-image/kube-cross
+KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
 
 # NOTE(claudiub): The Windows pause image also requires the wincat binary we're compiling for the
 # port-forwarding scenarios. If it's no longer necessary, it can be removed.
@@ -64,7 +60,7 @@ EXTENSION := ${EXTENSION.${OS}}
 # The manifest command is still experimental as of Docker 18.09.3
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
-TRIPLE.windows-amd64 := x86_64-w64-mingw32.static
+TRIPLE.windows-amd64 := x86_64-w64-mingw32
 TRIPLE.linux-amd64 := x86_64-linux-gnu
 TRIPLE.linux-arm := arm-linux-gnueabihf
 TRIPLE.linux-arm64 := aarch64-linux-gnu