Makefile: fix clab bgp cleanup (#3524)

Signed-off-by: zhangzujian <[email protected]>

.github/workflows/build-x86-image.yaml

@@ -23,7 +23,7 @@ concurrency:
 env:
   GO_VERSION: ''
   GOSEC_VERSION: '2.18.2'
-  HELM_VERSION: v3.13.2
+  HELM_VERSION: v3.13.3
   SUBMARINER_VERSION: '0.16.2'
 
 jobs:

.github/workflows/scheduled-e2e.yaml

@@ -11,7 +11,7 @@ concurrency:
 
 env:
   GO_VERSION: ''
-  HELM_VERSION: v3.13.2
+  HELM_VERSION: v3.13.3
   SUBMARINER_VERSION: '0.16.2'
 
 jobs:

Makefile

@@ -37,10 +37,10 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/
 KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml
 KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml
 
-CILIUM_VERSION = 1.14.4
+CILIUM_VERSION = 1.14.5
 CILIUM_IMAGE_REPO = quay.io/cilium/cilium
 
-CERT_MANAGER_VERSION = v1.13.2
+CERT_MANAGER_VERSION = v1.13.3
 CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION)
 CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION)
 CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
@@ -422,25 +422,25 @@ kind-init-bgp: kind-clean-bgp kind-init
 	docker run --rm --privileged \
 		--name kube-ovn-bgp \
 		--network host \
+		--pid host \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v /var/run/netns:/var/run/netns \
 		-v /var/lib/docker/containers:/var/lib/docker/containers \
-		--pid=host \
-		-v $(CURDIR)/yamls/clab-bgp.yaml:/clab.yaml \
-		$(CLAB_IMAGE) clab deploy -t /clab.yaml
+		-v $(CURDIR)/yamls/clab-bgp.yaml:/clab-bgp/clab.yaml \
+		$(CLAB_IMAGE) clab deploy -t /clab-bgp/clab.yaml
 
 .PHONY: kind-init-bgp-ha
 kind-init-bgp-ha: kind-clean-bgp kind-init
 	kube_ovn_version=$(VERSION) j2 yamls/clab-bgp-ha.yaml.j2 -o yamls/clab-bgp-ha.yaml
 	docker run --rm --privileged \
 		--name kube-ovn-bgp \
 		--network host \
+		--pid host \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v /var/run/netns:/var/run/netns \
 		-v /var/lib/docker/containers:/var/lib/docker/containers \
-		--pid=host \
-		-v $(CURDIR)/yamls/clab-bgp-ha.yaml:/clab.yaml \
-		$(CLAB_IMAGE) clab deploy -t /clab.yaml
+		-v $(CURDIR)/yamls/clab-bgp-ha.yaml:/clab-bgp/clab.yaml \
+		$(CLAB_IMAGE) clab deploy -t /clab-bgp/clab.yaml
 
 .PHONY: kind-load-image
 kind-load-image:
@@ -894,12 +894,12 @@ kind-clean-bgp: kind-clean-bgp-ha
 	docker run --rm --privileged \
 		--name kube-ovn-bgp \
 		--network host \
+		--pid host \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v /var/run/netns:/var/run/netns \
 		-v /var/lib/docker/containers:/var/lib/docker/containers \
-		--pid=host \
-		-v $(CURDIR)/yamls/clab-bgp.yaml:/clab.yaml \
-		$(CLAB_IMAGE) clab destroy -t /clab.yaml
+		-v $(CURDIR)/yamls/clab-bgp.yaml:/clab-bgp/clab.yaml \
+		$(CLAB_IMAGE) clab destroy -t /clab-bgp/clab.yaml
 	@$(MAKE) kind-clean
 
 .PHONY: kind-clean-bgp-ha
@@ -908,12 +908,12 @@ kind-clean-bgp-ha:
 	docker run --rm --privileged \
 		--name kube-ovn-bgp \
 		--network host \
+		--pid host \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v /var/run/netns:/var/run/netns \
 		-v /var/lib/docker/containers:/var/lib/docker/containers \
-		--pid=host \
-		-v $(CURDIR)/yamls/clab-bgp-ha.yaml:/clab.yaml \
-		$(CLAB_IMAGE) clab destroy -t /clab.yaml
+		-v $(CURDIR)/yamls/clab-bgp-ha.yaml:/clab-bgp/clab.yaml \
+		$(CLAB_IMAGE) clab destroy -t /clab-bgp/clab.yaml
 	@$(MAKE) kind-clean
 
 .PHONY: uninstall