Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: fix clab bgp cleanup #3524

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Makefile: fix clab bgp cleanup #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-x86-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

env:
GO_VERSION: ''
HELM_VERSION: v3.13.2
HELM_VERSION: v3.13.3
SUBMARINER_VERSION: '0.16.2'

jobs:
Expand Down
28 changes: 14 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading