From e9dd28929a529d8cb73cea5bb7742b4c56c085e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= <zhangzujian.7@gmail.com>
Date: Thu, 16 Mar 2023 09:44:32 +0800
Subject: [PATCH] fix scheduled submariner e2e (#2469)

---
 .github/workflows/build-x86-image.yaml |  9 +++++----
 .github/workflows/scheduled-e2e.yaml   | 12 +++++-------
 Makefile                               | 14 ++++----------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
index 36f14f54b81..f9bb7c4dcac 100644
--- a/.github/workflows/build-x86-image.yaml
+++ b/.github/workflows/build-x86-image.yaml
@@ -23,6 +23,7 @@ concurrency:
 env:
   GOSEC_VERSION: '2.15.0'
   HELM_VERSION: v3.11.1
+  SUBMARINER_VERSION: v0.13.4
 
 jobs:
   build-kube-ovn-base:
@@ -1578,10 +1579,10 @@ jobs:
           install_only: true
 
       - name: Install submariner subctl
-        run: |
-          curl -Ls https://get.submariner.io | VERSION=v0.13.4 bash
-          sudo chmod +x ~/.local/bin/subctl
-          sudo mv ~/.local/bin/subctl /usr/bin/
+        env:
+          VERSION: ${{ env.SUBMARINER_VERSION }}
+          DESTDIR: /usr/local/bin
+        run: curl -Ls https://get.submariner.io | bash
 
       - name: Download image
         uses: actions/download-artifact@v3
diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml
index 52e788d938e..70a32afe351 100644
--- a/.github/workflows/scheduled-e2e.yaml
+++ b/.github/workflows/scheduled-e2e.yaml
@@ -11,6 +11,7 @@ concurrency:
 
 env:
   HELM_VERSION: v3.11.1
+  SUBMARINER_VERSION: v0.13.4
 
 jobs:
   k8s-conformance-e2e:
@@ -1217,9 +1218,6 @@ jobs:
       matrix:
         branch:
           - master
-          - release-1.11
-          - release-1.10
-          - release-1.9
     steps:
       - uses: actions/checkout@v3
 
@@ -1239,10 +1237,10 @@ jobs:
           install_only: true
 
       - name: Install submariner subctl
-        run: |
-          curl -Ls https://get.submariner.io | VERSION=v0.13.4 bash
-          sudo chmod +x ~/.local/bin/subctl
-          sudo mv ~/.local/bin/subctl /usr/bin/
+        env:
+          VERSION: ${{ env.SUBMARINER_VERSION }}
+          DESTDIR: /usr/local/bin
+        run: curl -Ls https://get.submariner.io | bash
 
       - name: Create kind cluster
         working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }}
diff --git a/Makefile b/Makefile
index 173161e20cb..96734f2f0e2 100644
--- a/Makefile
+++ b/Makefile
@@ -573,16 +573,10 @@ kind-install-lb-svc: kind-load-image kind-untaint-control-plane
 	kubectl describe no
 
 .PHONY: kind-install-webhook
-kind-install-webhook: kind-load-image kind-untaint-control-plane
-	$(call docker_ensure_image_exists,$(CERT_MANAGER_CONTROLLER))
-	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_CONTROLLER))
-	$(call docker_ensure_image_exists,$(CERT_MANAGER_CAINJECTOR))
-	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_CAINJECTOR))
-	$(call docker_ensure_image_exists,$(CERT_MANAGER_WEBHOOK))
-	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_WEBHOOK))
-
-	sed 's/VERSION=.*/VERSION=$(VERSION)/' dist/images/install.sh | bash
-	kubectl describe no
+kind-install-webhook: kind-install
+	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_CONTROLLER),1)
+	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_CAINJECTOR),1)
+	$(call kind_load_image,kube-ovn,$(CERT_MANAGER_WEBHOOK),1)
 
 	kubectl apply -f "$(CERT_MANAGER_YAML)"
 	kubectl rollout status deployment/cert-manager -n cert-manager --timeout 120s