format patch update-kube-proxy-iptables.1.18.patch

klts-io · Nov 14, 2024 · 65f9e23 · 65f9e23
1 parent 01ef815
commit 65f9e23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/hack/test_cmd.sh b/hack/test_cmd.sh
@@ -5,7 +5,9 @@ set -o nounset
 set -o pipefail
 
 source "kit/helper.sh"
-KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/../src/github.com/kubernetes/kubernetes/
+export TERM=linux
+echo "KUBE_ROOT directory: $KUBE_ROOT"
 cd "${WORKDIR}"
 
 # Kubeadm was added for testing in 1.19 and later
@@ -16,7 +18,7 @@ for n in {1..5}; do
 # before v1.25
 make generated_files kubeadm
 # after v1.26
-make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
+TERM=linux ./build/run.sh make all WHAT=cmd/kubeadm
 
 mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
 ./hack/install-etcd.sh

diff --git a/patches/update-kube-proxy-iptables.1.18.patch b/patches/update-kube-proxy-iptables.1.18.patch
@@ -22,7 +22,7 @@ index 70e3874b441..4c67a178517 100644
      },
  }
 diff --git a/build/common.sh b/build/common.sh
-index 75dc82ed335..3771dafdaf5 100755
+index 9cd95b5af51..13c15466c39 100755
 --- a/build/common.sh
 +++ b/build/common.sh
 @@ -95,14 +95,14 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730