Skip to content

Commit

Permalink
update kube-ovn to use 1.12
Browse files Browse the repository at this point in the history
Signed-off-by: bobz965 <[email protected]>
  • Loading branch information
bobz965 committed Dec 18, 2024
1 parent b854196 commit d8e06e4
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 4,182 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [calico](https://github.com/projectcalico/calico) v3.28.1
- [cilium](https://github.com/cilium/cilium) v1.15.9
- [flannel](https://github.com/flannel-io/flannel) v0.22.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.12.21
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.12.28
- [kube-router](https://github.com/cloudnativelabs/kube-router) v2.0.0
- [multus](https://github.com/k8snetworkplumbingwg/multus-cni) v3.8
- [weave](https://github.com/rajch/weave) v2.8.7
Expand Down
2 changes: 1 addition & 1 deletion roles/kubespray-defaults/defaults/main/download.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ cilium_version: "v1.15.9"
cilium_cli_version: "v0.16.0"
cilium_enable_hubble: false

kube_ovn_version: "v1.12.21"
kube_ovn_version: "v1.12.28"
kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}"
kube_router_version: "v2.0.0"
multus_version: "v4.1.0"
Expand Down
75 changes: 71 additions & 4 deletions roles/network_plugin/kube-ovn/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
# request and limit
kube_ovn_db_cpu_request: 500m
kube_ovn_db_memory_request: 200Mi
kube_ovn_db_cpu_limit: 3000m
Expand Down Expand Up @@ -41,6 +42,12 @@ kube_ovn_ic_autoroute: true
kube_ovn_ic_dbhost: "127.0.0.1"
kube_ovn_ic_zone: "kubernetes"

# kube-ovn default subnet
kube_ovn_default_subnet: "ovn-default"
kube_ovn_default_vpc: "ovn-cluster"
kube_ovn_node_subnet: "join"
kube_ovn_mirror_iface: "mirror0"

# geneve or vlan
kube_ovn_network_type: geneve

Expand All @@ -58,7 +65,9 @@ kube_ovn_hw_offload: false
kube_ovn_traffic_mirror: false

# kube_ovn_pool_cidr_ipv6: fd85:ee78:d8a6:8607::1:0000/112
# kube_ovn_default_interface_name: eth0

kube_ovn_default_provider_name: provider
kube_ovn_default_vlan_interface_name: eth0

kube_ovn_external_address: 8.8.8.8
kube_ovn_external_address_ipv6: 2400:3200::1
Expand All @@ -77,6 +86,7 @@ kube_ovn_node_switch_cidr_ipv6: fd00:100:64::/64

## vlan config, set default interface name and vlan id
# kube_ovn_default_interface_name: eth0
kube_ovn_default_vlan_name: vlan100
kube_ovn_default_vlan_id: 100
kube_ovn_vlan_name: product

Expand Down Expand Up @@ -105,14 +115,71 @@ 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
## enable compact
kube_ovn_enable_compact: false

## ovn northd n threads
kube_ovn_northd_n_threads: 1

## ovn leader probe interval
kube_ovn_leader_probe_interval: 5

## ovn probe interval
kube_ovn_probe_interval: 180000

# ovn northd probe interval
kube_ovn_northd_probe_interval: 5000

# ovn remote probe interval
kube_ovn_remote_probe_interval: 10000

# ovn remote openflow interval
kube_ovn_remote_openflow_interval: 180

## eip snat need configmap "ovn-vpc-nat-config" set by user first
kube_ovn_eip_snat_enabled: false

# ls dnat mod dl dst
kube_ovn_ls_dnat_mod_dl_dst: true

# ls ct skip dst lport ips
kube_ovn_ls_ct_skip_dst_lport_ips: true

# enable ecmp
kube_ovn_enable_ecmp: false

# enable metrics
kube_ovn_enable_metrics: true

# enable tproxy
kube_ovn_enable_tproxy: false

# ovs vsctl concurrency
kube_ovn_ovs_vsctl_concurrency: 100

# enable sercure service
kube_ovn_enable_secure_serving: false

# ovn exchange link name with ovs bridge name
kube_ovn_exchange_link_name: false

## keep vm ip
kube_ovn_keep_vm_ip: true

## cni config priority, default: 01
kube_ovn_cni_config_priority: '01'
kube_ovn_cni_config_priority: "01"

# nodelocaldns_ip
nodelocaldns_ip: 169.254.25.10

# ovs db connection timeout
kube_ovn_ovsdb_connection_timeout: 3

# ovs db inactivity probe timeout
kube_ovn_ovsdb_inactivity_probe: 10

# kube ovn gc interval
kube_ovn_gc_interval: 360

# kube ovn inspect interval
kube_ovn_inspect_interval: 20
8 changes: 5 additions & 3 deletions roles/network_plugin/kube-ovn/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
dest: "{{ kube_config_dir }}/{{ item.file }}"
mode: "0644"
with_items:
- {name: kube-ovn-crd, file: cni-kube-ovn-crd.yml}
- {name: ovn, file: cni-ovn.yml}
- {name: kube-ovn, file: cni-kube-ovn.yml}
- { name: kube-ovn-crd, file: cni-kube-ovn-crd.yml }
- { name: kube-ovn, file: cni-kube-ovn.yml }
- { name: ovn-sa, file: ovn-SA.yml }
- { name: ovn-cr, file: ovn-CR.yml }
- { name: ovn-crb, file: ovn-CRB.yml }
register: kube_ovn_node_manifests
Loading

0 comments on commit d8e06e4

Please sign in to comment.