Update build script for k8s windows 1.8
@@ -85,11 +85,31 @@ k8s_17_cherry_pick() {
}
k8s_18_cherry_pick() {
+ # 4dcfaf655d fix get stats/summary issue in azure/release-1.8
+ # ...
# 4647f2f616 merge #52401: add windows implementation of GetMountRefs
+
+ # d75ef50170 merge#54334: fix azure disk mount failure on coreos and some other distros
+
+ # Only cherry pick before 1.8.6 due to merge conflict with 1.8.6 and up: b8594873f4 merge #50673: azure disk fix of SovereignCloud support
+
+ # cb29df51c0 Fixing 'targetport' to service 'port' mapping
+ # ...
+ # b42981f90b merge#53629: fix azure file mount limit issue on windows due to using drive letter
+
+ # We have to skip 8b3345114e due to merge conflict with 1.8.4 and up, 4647f2f616 has the change.
+
+ # 8d477271f7 update bazel
# ...
# 69644018c8 Use adapter vEthernet (HNSTransparent) on Windows host network to find node IP
- git cherry-pick --allow-empty --keep-redundant-commits 69644018c8^..d75ef50170
+ git cherry-pick --allow-empty --keep-redundant-commits 69644018c8^..8d477271f7
+ git cherry-pick --allow-empty --keep-redundant-commits b42981f90b^..cb29df51c0
+ if [ "${version}" \< "1.8.6" ]; then
+ git cherry-pick --allow-empty --keep-redundant-commits b8594873f4
+ fi
+ git cherry-pick --allow-empty --keep-redundant-commits d75ef50170
+ git cherry-pick --allow-empty --keep-redundant-commits 4647f2f616^..4dcfaf655d
}
apply_acs_cherry_picks() {
