Skip to content

Commit 8597b90

Browse files
committed
ci: fix multus installation (#3062)
1 parent b171744 commit 8597b90

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.vscode/*
33
.DS_Store
44
dist/images/test-server
5+
dist/images/kube-ovn
56
dist/images/kube-ovn-cmd
67
dist/images/kube-ovn-webhook
78
dist/windows/kube-ovn.exe

Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ GOLDFLAGS = "-w -s -extldflags '-z now' -X github.com/kubeovn/kube-ovn/versions.
1313

1414
CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane
1515

16-
MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
17-
MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/master/deployments/multus-daemonset-thick.yml
16+
MULTUS_VERSION = v4.0.2
17+
MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:$(MULTUS_VERSION)-thick
18+
MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/$(MULTUS_VERSION)/deployments/multus-daemonset-thick.yml
1819

1920
CILIUM_VERSION = 1.12.7
2021
CILIUM_IMAGE_REPO = quay.io/cilium/cilium
@@ -491,11 +492,11 @@ kind-install-underlay-logical-gateway-dual: kind-disable-hairpin kind-load-image
491492
.PHONY: kind-install-multus
492493
kind-install-multus:
493494
$(call kind_load_image,kube-ovn,$(MULTUS_IMAGE),1)
494-
kubectl apply -f "$(MULTUS_YAML)"
495+
curl -s "$(MULTUS_YAML)" | sed 's/:snapshot-thick/:$(MULTUS_VERSION)-thick/g' | kubectl apply -f -
495496
kubectl -n kube-system rollout status ds kube-multus-ds
496497

497498
.PHONY: kind-install-lb-svc
498-
kind-install-lb-svc: kind-load-image kind-untaint-control-plane
499+
kind-install-lb-svc:
499500
$(call kind_load_image,kube-ovn,$(VPC_NAT_GW_IMG))
500501
@$(MAKE) ENABLE_LB_SVC=true CNI_CONFIG_PRIORITY=10 kind-install
501502
@$(MAKE) kind-install-multus

0 commit comments

Comments
 (0)