From 6582eb0d3663efbe370ca39542c10e9a58b0dd74 Mon Sep 17 00:00:00 2001
From: Vince Prignano <vincepri@redhat.com>
Date: Fri, 5 Apr 2024 11:15:57 -0700
Subject: [PATCH] nice try

Signed-off-by: Vince Prignano <vincepri@redhat.com>
---
 .github/workflows/tools-releases.yml  | 2 +-
 hack/tools/envtest/darwin/Dockerfile  | 2 ++
 hack/tools/envtest/linux/Dockerfile   | 4 ++--
 hack/tools/envtest/windows/Dockerfile | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tools-releases.yml b/.github/workflows/tools-releases.yml
index bb0e8f2a0..b4b305fcf 100644
--- a/.github/workflows/tools-releases.yml
+++ b/.github/workflows/tools-releases.yml
@@ -47,7 +47,7 @@ jobs:
         with:
           context: .
           file: ./hack/tools/envtest/${{matrix.os}}/Dockerfile
-          platforms: "{{matrix.os}}/{{matrix.arch}}"
+          platforms: "${{matrix.os}}/${{matrix.arch}}"
           build-args: |
             KUBERNETES_VERSION=v${{env.KUBERNETES_VERSION}}
           push: true
diff --git a/hack/tools/envtest/darwin/Dockerfile b/hack/tools/envtest/darwin/Dockerfile
index e7a5478b9..99100452c 100644
--- a/hack/tools/envtest/darwin/Dockerfile
+++ b/hack/tools/envtest/darwin/Dockerfile
@@ -22,6 +22,8 @@ FROM golang:1.21 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/
diff --git a/hack/tools/envtest/linux/Dockerfile b/hack/tools/envtest/linux/Dockerfile
index 1b4f2c6c9..560a18912 100644
--- a/hack/tools/envtest/linux/Dockerfile
+++ b/hack/tools/envtest/linux/Dockerfile
@@ -23,8 +23,8 @@ FROM alpine:3.19 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
-ARG OS=linux
-ARG ARCH
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/
diff --git a/hack/tools/envtest/windows/Dockerfile b/hack/tools/envtest/windows/Dockerfile
index 6ae98272a..45eb110ac 100644
--- a/hack/tools/envtest/windows/Dockerfile
+++ b/hack/tools/envtest/windows/Dockerfile
@@ -22,8 +22,8 @@ FROM golang:1.21 as builder
 # Version and platform args.
 ARG KUBERNETES_VERSION
 ARG ETCD_VERSION=v3.5.13
-ARG OS=windows
-ARG ARCH
+ARG TARGETOS
+ARG TARGETARCH
 
 # Tools path.
 ENV DEST=/usr/local/kubebuilder/bin/