From a27bfb7292389d9f167e354beb9f68c1490779e3 Mon Sep 17 00:00:00 2001
From: Gabor Javorszky <g.javorszky@f5.com>
Date: Thu, 19 Jun 2025 13:36:07 +0100
Subject: [PATCH 1/2] Pin mvdan/gofumpt to v0.8.0 instead of latest

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d40608240..62848c72e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -194,7 +194,7 @@ jobs:
         if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
 
       - name: Install gofumpt
-        run: go install mvdan.cc/gofumpt@latest
+        run: go install mvdan.cc/gofumpt@v0.8.0
         if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
 
       - name: Check if telemetry schema changed

From 299c1dc093e5df13fdfb27f32b422f163e91b7e4 Mon Sep 17 00:00:00 2001
From: Gabor Javorszky <g.javorszky@f5.com>
Date: Thu, 19 Jun 2025 13:37:30 +0100
Subject: [PATCH 2/2] Quote bash variables to prevent globbing

See shellcheck SC2053
https://github.com/koalaman/shellcheck/wiki/SC2053
---
 hack/docker.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hack/docker.sh b/hack/docker.sh
index 5b608bbc14..f1cdcf1fe0 100755
--- a/hack/docker.sh
+++ b/hack/docker.sh
@@ -4,12 +4,12 @@ git_tag=$1
 docker_tag=edge
 
 git_commit=$(git rev-parse HEAD)
-commit_tag=$(git describe --exact-match ${git_commit} 2>/dev/null)
+commit_tag=$(git describe --exact-match "${git_commit}" 2>/dev/null)
 
-if [[ ${commit_tag} == ${git_tag} ]]; then
+if [[ ${commit_tag} == "${git_tag}" ]]; then
     # we're on the exact commit of the tag, use the docker image for the tag
     docker_tag=${git_tag//v/}
-    echo ${docker_tag}
+    echo "${docker_tag}"
     exit 0
 
 else
@@ -17,7 +17,7 @@ else
     # if it's the latest commit from 'main' the SHA will match the 'revision' of the 'edge' docker image
     docker pull nginx/nginx-ingress:${docker_tag} >/dev/null 2>&1
     DOCKER_SHA=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.revision" }}' nginx/nginx-ingress:${docker_tag})
-    if [[ ${DOCKER_SHA} == ${git_commit} ]]; then
+    if [[ ${DOCKER_SHA} == "${git_commit}" ]]; then
         # we're on the same commit as the latest edge
         echo ${docker_tag}
         exit 0