fix CI failure

Author: pacoxu

patches/fix-etcd-put-key.1.23.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Remove writable verification in etcd startup
  1 file changed, 1 deletion(-)
 
 diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
-index 756e342499c..f6a9d1fa393 100755
+index a548dc59c45..515187c2adc 100755
 --- a/hack/lib/etcd.sh
 +++ b/hack/lib/etcd.sh
 @@ -88,7 +88,6 @@ kube::etcd::start() {

patches/fix-etcd-put-key.1.24.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Remove writable verification in etcd startup
  1 file changed, 1 deletion(-)
 
 diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
-index d4752b3c598..93f866c573a 100755
+index 307d241d294..b01dd760bcc 100755
 --- a/hack/lib/etcd.sh
 +++ b/hack/lib/etcd.sh
 @@ -92,7 +92,6 @@ kube::etcd::start() {

patches/fix-run-docker.1.24.patch

@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Run docker as root in tests
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/common.sh b/build/common.sh
-index 4cc487a78a7..4fc04033c17 100755
+index 257d36b2fa7..96852d940f2 100755
 --- a/build/common.sh
 +++ b/build/common.sh
 @@ -490,7 +490,7 @@ function kube::build::run_build_command_ex() {
@@ -31,7 +31,7 @@ Subject: [PATCH 2/2] Run docker with device kmsg
  1 file changed, 1 insertion(+)
 
 diff --git a/build/common.sh b/build/common.sh
-index 4fc04033c17..07779138041 100755
+index 96852d940f2..48998f4a21a 100755
 --- a/build/common.sh
 +++ b/build/common.sh
 @@ -492,6 +492,7 @@ function kube::build::run_build_command_ex() {

patches/no-delete-images.1.24.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] No delete images
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/lib/release.sh b/build/lib/release.sh
-index 6bc6624951e..cb8455b298a 100644
+index ef262b5ed04..2130f1e239a 100644
 --- a/build/lib/release.sh
 +++ b/build/lib/release.sh
-@@ -408,8 +408,8 @@ function kube::release::create_docker_images_for_server() {
+@@ -364,8 +364,8 @@ function kube::release::create_docker_images_for_server() {
          rm -rf "${docker_build_path}"
          ln "${binary_file_path}.tar" "${images_dir}/"
 

releases.yml

@@ -73,12 +73,8 @@ releases:
       - nokmem.1.20
 
   - name: v1.18.20-dce.1
-    base_release: v1.18.20-ci
+    base_release: v1.18.20-lts.2
     patches:
-      - CVE-2020-8554.1.18
-      - fix-missing-env-91500.1.18
-      - CVE-2021-25741.1.18
-      - nokmem.1.20
       - update-kube-proxy-iptables.1.18
 
   - name: v1.17.17-lts.2
@@ -293,7 +289,7 @@ releases:
     base_release: v1.18.20
     patches:
       - fix-run-docker.1.24
-      # - no-delete-images.1.24
+      - no-delete-images.1.24
       - fix-etcd-put-key.1.23
     test_failures_tolerated:
       - k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler