From fec52d53ed1beb660917bfd03528934ecfa2141b Mon Sep 17 00:00:00 2001
From: Adam Dyess <adam.dyess@canonical.com>
Date: Mon, 16 Sep 2024 16:59:21 -0500
Subject: [PATCH] Update Bot information only if git email currently unset

---
 build-scripts/patches/moonray/apply | 9 ++++++---
 build-scripts/patches/strict/apply  | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build-scripts/patches/moonray/apply b/build-scripts/patches/moonray/apply
index 1233dae42..32a2f8510 100755
--- a/build-scripts/patches/moonray/apply
+++ b/build-scripts/patches/moonray/apply
@@ -2,9 +2,12 @@
 
 DIR="$(realpath "$(dirname "${0}")")"
 
-# Configure git author
-git config user.email k8s-bot@canonical.com
-git config user.name k8s-bot
+# Configure git author if unset
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email k8s-team-ci@canonical.com
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Remove unrelated tests
 rm "${DIR}/../../../tests/integration/tests/test_cilium_e2e.py"
diff --git a/build-scripts/patches/strict/apply b/build-scripts/patches/strict/apply
index 1729742e2..3f6f7de14 100755
--- a/build-scripts/patches/strict/apply
+++ b/build-scripts/patches/strict/apply
@@ -3,8 +3,11 @@
 DIR="$(realpath "$(dirname "${0}")")"
 
 # Configure git author
-git config user.email k8s-bot@canonical.com
-git config user.name k8s-bot
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email k8s-team-ci@canonical.com
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Apply strict patch
 git am "${DIR}/0001-Strict-patch.patch"