From 6f61f3d9cbbe7e5f1d28f12bee18853afd4bba7c Mon Sep 17 00:00:00 2001
From: Jochen Friedrich <j.friedrich@nwe.de>
Date: Mon, 16 Jan 2023 09:08:52 +0100
Subject: [PATCH] Support OVN Interconnect (#9599)
Mostly taken from: https://raw.githubusercontent.com/kubeovn/kube-ovn/master/yamls/ovn-ic.yaml.j2
---
.../group_vars/k8s_cluster/k8s-net-kube-ovn.yml | 6 ++++++
roles/network_plugin/kube-ovn/defaults/main.yml | 5 +++++
.../kube-ovn/templates/cni-kube-ovn.yml.j2 | 16 ++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-kube-ovn.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-kube-ovn.yml
index d580e15fc..c241a76ea 100644
--- a/inventory/sample/group_vars/k8s_cluster/k8s-net-kube-ovn.yml
+++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-kube-ovn.yml
@@ -55,3 +55,9 @@ kube_ovn_enable_ssl: false
## dpdk
kube_ovn_dpdk_enabled: false
+
+## enable interconnection to an existing IC database server.
+kube_ovn_ic_enable: false
+kube_ovn_ic_autoroute: true
+kube_ovn_ic_dbhost: "127.0.0.1"
+kube_ovn_ic_zone: "kubernetes"
diff --git a/roles/network_plugin/kube-ovn/defaults/main.yml b/roles/network_plugin/kube-ovn/defaults/main.yml
index 9fa98054a..bda0eecde 100644
--- a/roles/network_plugin/kube-ovn/defaults/main.yml
+++ b/roles/network_plugin/kube-ovn/defaults/main.yml
@@ -36,6 +36,11 @@ kube_ovn_central_ips: |-
{{ hostvars[item]['ip'] | default(fallback_ips[item]) }}{% if not loop.last %},{% endif %}
{%- endfor %}
+kube_ovn_ic_enable: false
+kube_ovn_ic_autoroute: true
+kube_ovn_ic_dbhost: "127.0.0.1"
+kube_ovn_ic_zone: "kubernetes"
+
# geneve or vlan
kube_ovn_network_type: geneve
diff --git a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
index c6eacc128..b90d18058 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
@@ -608,3 +608,19 @@ spec:
ports:
- port: 10665
name: metrics
+{% if kube_ovn_ic_enable %}
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: ovn-ic-config
+ namespace: kube-system
+data:
+ enable-ic: "{{ kube_ovn_ic_enable | lower }}"
+ az-name: "{{ kube_ovn_ic_zone }}"
+ ic-db-host: "{{ kube_ovn_ic_dbhost }}"
+ ic-nb-port: "6645"
+ ic-sb-port: "6646"
+ gw-nodes: "{{ kube_ovn_central_hosts|join(',') }}"
+ auto-route: "{{ kube_ovn_ic_autoroute | lower }}"
+{% endif %}
--
GitLab