Skip to content

Commit f38a533

Browse files
committed
format patch update-kube-proxy-iptables.1.18.patch
1 parent 01ef815 commit f38a533

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

hack/test_cmd.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ set -o nounset
55
set -o pipefail
66

77
source "kit/helper.sh"
8-
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
8+
export KUBE_ROOT=$(dirname "$(readlink -f "$0")")/../src/github.com/kubernetes/kubernetes/
9+
export TERM=linux
10+
echo "KUBE_ROOT directory: $KUBE_ROOT"
911
cd "${WORKDIR}"
1012

1113
# Kubeadm was added for testing in 1.19 and later
@@ -16,7 +18,7 @@ for n in {1..5}; do
1618
# before v1.25
1719
make generated_files kubeadm
1820
# after v1.26
19-
make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
21+
./build/run.sh make all WHAT=cmd/kubeadm
2022
2123
mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
2224
./hack/install-etcd.sh

patches/update-kube-proxy-iptables.1.18.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ index 70e3874b441..4c67a178517 100644
2222
},
2323
}
2424
diff --git a/build/common.sh b/build/common.sh
25-
index 75dc82ed335..3771dafdaf5 100755
25+
index 9cd95b5af51..13c15466c39 100755
2626
--- a/build/common.sh
2727
+++ b/build/common.sh
2828
@@ -95,14 +95,14 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730

0 commit comments

Comments
 (0)