Skip to content

Commit

Permalink
kube_ovn_cni_config_priority (#10125)
Browse files Browse the repository at this point in the history
  • Loading branch information
yankay authored May 25, 2023
1 parent 861d5b7 commit 9d1e9a6
Show file tree
Hide file tree
Showing 7 changed files with 521 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci/packet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ packet_centos7-calico-ha-once-localhost:

packet_almalinux8-kube-ovn:
stage: deploy-part2
extends: .packet_periodic
extends: .packet_pr
when: on_success

packet_almalinux8-calico:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [calico](https://github.com/projectcalico/calico) v3.25.1
- [cilium](https://github.com/cilium/cilium) v1.13.0
- [flannel](https://github.com/flannel-io/flannel) v0.21.4
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.10.7
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.11.5
- [kube-router](https://github.com/cloudnativelabs/kube-router) v1.5.1
- [multus](https://github.com/k8snetworkplumbingwg/multus-cni) v3.8
- [weave](https://github.com/weaveworks/weave) v2.8.1
Expand Down
2 changes: 1 addition & 1 deletion roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ cilium_version: "v1.13.0"
cilium_cli_version: "v0.13.1"
cilium_enable_hubble: false

kube_ovn_version: "v1.10.7"
kube_ovn_version: "v1.11.5"
kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}"
kube_router_version: "v1.5.1"
multus_version: "v3.8"
Expand Down
10 changes: 10 additions & 0 deletions roles/network_plugin/kube-ovn/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ kube_ovn_external_dns: alauda.cn
# kube_ovn_default_gateway: 10.233.64.1,fd85:ee78:d8a6:8607::1:0
kube_ovn_default_gateway_check: true
kube_ovn_default_logical_gateway: false

# u2o_interconnection
kube_ovn_u2o_interconnection: false

# kube_ovn_default_exclude_ips: 10.16.0.1
kube_ovn_node_switch_cidr: 100.64.0.0/16
kube_ovn_node_switch_cidr_ipv6: fd00:100:64::/64
Expand Down Expand Up @@ -98,9 +102,15 @@ kube_ovn_enable_ssl: false
kube_ovn_dpdk_enabled: false
kube_ovn_dpdk_tunnel_iface: br-phy

## bind local ip
kube_ovn_bind_local_ip_enabled: true

## eip snat
kube_ovn_eip_snat_enabled: true

# ls dnat mod dl dst
kube_ovn_ls_dnat_mod_dl_dst: true

## keep vm ip
kube_ovn_keep_vm_ip: true

Expand Down
Loading

0 comments on commit 9d1e9a6

Please sign in to comment.