File tree 2 files changed +6
-4
lines changed
2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change 2
2
.vscode /*
3
3
.DS_Store
4
4
dist /images /test-server
5
+ dist /images /kube-ovn
5
6
dist /images /kube-ovn-cmd
6
7
dist /images /kube-ovn-webhook
7
8
dist /windows /kube-ovn.exe
Original file line number Diff line number Diff line change @@ -13,8 +13,9 @@ GOLDFLAGS = "-w -s -extldflags '-z now' -X github.com/kubeovn/kube-ovn/versions.
13
13
14
14
CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane
15
15
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
18
19
19
20
CILIUM_VERSION = 1.12.7
20
21
CILIUM_IMAGE_REPO = quay.io/cilium/cilium
@@ -491,11 +492,11 @@ kind-install-underlay-logical-gateway-dual: kind-disable-hairpin kind-load-image
491
492
.PHONY : kind-install-multus
492
493
kind-install-multus :
493
494
$(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 -
495
496
kubectl -n kube-system rollout status ds kube-multus-ds
496
497
497
498
.PHONY : kind-install-lb-svc
498
- kind-install-lb-svc : kind-load-image kind-untaint-control-plane
499
+ kind-install-lb-svc :
499
500
$(call kind_load_image,kube-ovn,$(VPC_NAT_GW_IMG ) )
500
501
@$(MAKE ) ENABLE_LB_SVC=true CNI_CONFIG_PRIORITY=10 kind-install
501
502
@$(MAKE ) kind-install-multus
You can’t perform that action at this time.
0 commit comments