diff --git a/.gitignore b/.gitignore index 00cfb1f8674..8a45a7c5feb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .vscode/* .DS_Store dist/images/test-server +dist/images/kube-ovn dist/images/kube-ovn-cmd dist/images/kube-ovn-webhook dist/windows/kube-ovn.exe diff --git a/Makefile b/Makefile index 2c9b1a43e34..e97fcb46b2e 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,9 @@ GOLDFLAGS = "-w -s -extldflags '-z now' -X github.com/kubeovn/kube-ovn/versions. CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane -MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick -MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/master/deployments/multus-daemonset-thick.yml +MULTUS_VERSION = v4.0.2 +MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:$(MULTUS_VERSION)-thick +MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/$(MULTUS_VERSION)/deployments/multus-daemonset-thick.yml CILIUM_VERSION = 1.12.7 CILIUM_IMAGE_REPO = quay.io/cilium/cilium @@ -491,11 +492,11 @@ kind-install-underlay-logical-gateway-dual: kind-disable-hairpin kind-load-image .PHONY: kind-install-multus kind-install-multus: $(call kind_load_image,kube-ovn,$(MULTUS_IMAGE),1) - kubectl apply -f "$(MULTUS_YAML)" + curl -s "$(MULTUS_YAML)" | sed 's/:snapshot-thick/:$(MULTUS_VERSION)-thick/g' | kubectl apply -f - kubectl -n kube-system rollout status ds kube-multus-ds .PHONY: kind-install-lb-svc -kind-install-lb-svc: kind-load-image kind-untaint-control-plane +kind-install-lb-svc: $(call kind_load_image,kube-ovn,$(VPC_NAT_GW_IMG)) @$(MAKE) ENABLE_LB_SVC=true CNI_CONFIG_PRIORITY=10 kind-install @$(MAKE) kind-install-multus