From 802c943cefdec4c34ecd475318909af7ffecf677 Mon Sep 17 00:00:00 2001
From: fheinecke <23390735+fheinecke@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:12:24 -0600
Subject: [PATCH] [v14] Remove CI-specific UID/GID to appease GH's breaking
 change

GitHub unexpectedly made a breaking change to the `runner` user used in
GHA pipelines. This works around the issue by removing the hard-coded
uid/gid values in our makefile.
---
 build.assets/Makefile | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/build.assets/Makefile b/build.assets/Makefile
index 8b633a6f8f758..6ae9ba5b0dd7f 100644
--- a/build.assets/Makefile
+++ b/build.assets/Makefile
@@ -42,22 +42,7 @@ ifneq ("$(KUBECONFIG)","")
 DOCKERFLAGS := $(DOCKERFLAGS) -v $(KUBECONFIG):/mnt/kube/config -e KUBECONFIG=/mnt/kube/config -e TEST_KUBE=$(TEST_KUBE)
 endif
 
-# conditionally force the use of UID/GID 1000:1000 if we're running in Drone or Github Actions (in which case CI env var will be set)
-ifeq ("$(DRONE)","true")
-CI := true
-endif
 ifeq ("$(CI)","true")
-# The UID/GID of the runner user on ARC runners is 1001, not 1000
-# This var is currently only set for ARC runners via https://github.com/gravitational/cloud-terraform/pull/2473
-ifeq ("$(CI_SYSTEM)","ARC")
-UID := 1001
-GID := 1001
-NOROOT := -u 1001:1001
-else
-UID := 1000
-GID := 1000
-NOROOT := -u 1000:1000
-endif
 # if running in CI and the GOCACHE environment variable is not set, set it to a sensible default
 ifeq ("$(GOCACHE)",)
 GOCACHE := /go/cache