From e66351f7c455a323e7ef77e30f129a0506b8e15d Mon Sep 17 00:00:00 2001
From: Maciej Golaszewski <maciej.golaszewski@canonical.com>
Date: Tue, 5 Nov 2024 14:14:43 +0100
Subject: [PATCH] hardcode gitconfig

---
 build-scripts/addons/repositories.sh | 6 ------
 microk8s-resources/gitconfig         | 3 +++
 snap/snapcraft.yaml                  | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 microk8s-resources/gitconfig

diff --git a/build-scripts/addons/repositories.sh b/build-scripts/addons/repositories.sh
index 0b7f91b0a8..3108a16638 100755
--- a/build-scripts/addons/repositories.sh
+++ b/build-scripts/addons/repositories.sh
@@ -31,9 +31,3 @@ done
 echo "${ADDONS_REPOS_ENABLED}" > addons/.auto-add
 
 cp -r "addons" "${INSTALL}/addons"
-
-cat > ${INSTALL}/gitconfig << EOF
-[safe]
-        directory = /snap/microk8s/current/addons/community/.git
-
-EOF
diff --git a/microk8s-resources/gitconfig b/microk8s-resources/gitconfig
new file mode 100644
index 0000000000..370c6b79df
--- /dev/null
+++ b/microk8s-resources/gitconfig
@@ -0,0 +1,3 @@
+[safe]
+        directory = /snap/microk8s/current/addons/community/.git
+        directory = /snap/microk8s/current/addons/core/.git
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 44d69780c2..492160a704 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -250,6 +250,7 @@ parts:
       cp client.config.template "${SNAPCRAFT_PART_INSTALL}/client.config.template"
       cp kubelet.config.template "${SNAPCRAFT_PART_INSTALL}/kubelet.config.template"
       cp client-x509.config.template "${SNAPCRAFT_PART_INSTALL}/client-x509.config.template"
+      cp gitconfig "${SNAPCRAFT_PART_INSTALL}/gitconfig"
 
       cp -r wrappers/* "${SNAPCRAFT_PART_INSTALL}/"
       cp -r actions/ "${SNAPCRAFT_PART_INSTALL}/actions"