Support kube-ovn as cni to provide static ip address (#660)

oceanbase · Dec 2, 2024 · e176679 · e176679
1 parent 623a496
commit e176679
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/api/v1alpha1/observer_types.go b/api/v1alpha1/observer_types.go
@@ -108,6 +108,8 @@ func (s *OBServer) SupportStaticIP() bool {
 	switch s.Status.CNI {
 	case oceanbaseconst.CNICalico:
 		return true
+	case oceanbaseconst.CNIKubeOvn:
+		return true
 	default:
 		annos := s.GetAnnotations()
 		if annos == nil {

diff --git a/internal/const/oceanbase/annotations.go b/internal/const/oceanbase/annotations.go
@@ -13,8 +13,10 @@ See the Mulan PSL v2 for more details.
 package oceanbase
 
 const (
-	AnnotationCalicoValidate = "cni.projectcalico.org/podIP"
-	AnnotationCalicoIpAddrs  = "cni.projectcalico.org/ipAddrs"
+	AnnotationCalicoValidate  = "cni.projectcalico.org/podIP"
+	AnnotationCalicoIpAddrs   = "cni.projectcalico.org/ipAddrs"
+	AnnotationKubeOvnValidate = "ovn.kubernetes.io/ip_address"
+	AnnotationKubeOvnIpAddrs  = "ovn.kubernetes.io/ip_address"
 )
 
 const (
@@ -35,5 +37,6 @@ const (
 
 const (
 	CNICalico  = "calico"
+	CNIKubeOvn = "kube-ovn"
 	CNIUnknown = "unknown"
 )
diff --git a/internal/resource/observer/observer_manager.go b/internal/resource/observer/observer_manager.go
@@ -94,7 +94,9 @@ func (m *OBServerManager) UpdateStatus() error {
 			m.OBServer.Status.PodIp = pod.Status.PodIP
 			m.OBServer.Status.NodeIp = pod.Status.HostIP
 			// TODO update from obcluster
+			m.Logger.V(oceanbaseconst.LogLevelDebug).Info("OBServer pod info", "pod", pod)
 			m.OBServer.Status.CNI = resourceutils.GetCNIFromAnnotation(pod)
+			m.Logger.V(oceanbaseconst.LogLevelDebug).Info("Get CNI", "cni", m.OBServer.Status.CNI)
 
 			if m.OBServer.Status.ServiceIp == "" {
 				mode, modeAnnoExist := resourceutils.GetAnnotationField(m.OBServer, oceanbaseconst.AnnotationsMode)

diff --git a/internal/resource/observer/observer_task.go b/internal/resource/observer/observer_task.go
@@ -288,6 +288,10 @@ func AnnotateOBServerPod(m *OBServerManager) tasktypes.TaskError {
 		m.Logger.Info("Update pod annotation, cni is calico")
 		observerPod.Annotations[oceanbaseconst.AnnotationCalicoIpAddrs] = fmt.Sprintf("[\"%s\"]", m.OBServer.Status.PodIp)
 	}
+	if m.OBServer.Status.CNI == oceanbaseconst.CNIKubeOvn {
+		m.Logger.Info("Update pod annotation, cni is kube-ovn")
+		observerPod.Annotations[oceanbaseconst.AnnotationKubeOvnIpAddrs] = m.OBServer.Status.PodIp
+	}
 	err = m.K8sResClient.Update(m.Ctx, observerPod)
 	if err != nil {
 		return errors.Wrapf(err, "Failed to update pod annotation of observer %s", m.OBServer.Name)

diff --git a/internal/resource/observer/utils.go b/internal/resource/observer/utils.go
@@ -643,6 +643,10 @@ func (m *OBServerManager) generateStaticIpAnnotation() map[string]string {
 		if m.OBServer.Status.PodIp != "" {
 			annotations[oceanbaseconst.AnnotationCalicoIpAddrs] = fmt.Sprintf("[\"%s\"]", m.OBServer.Status.PodIp)
 		}
+	case oceanbaseconst.CNIKubeOvn:
+		if m.OBServer.Status.PodIp != "" {
+			annotations[oceanbaseconst.AnnotationKubeOvnIpAddrs] = m.OBServer.Status.PodIp
+		}
 	default:
 		m.Logger.Info("No CNI is configured, set empty annotation")
 	}

diff --git a/internal/resource/utils/annotations.go b/internal/resource/utils/annotations.go
@@ -19,10 +19,16 @@ import (
 )
 
 func GetCNIFromAnnotation(pod *corev1.Pod) string {
+	// check annotation for calico
 	_, found := pod.Annotations[oceanbaseconst.AnnotationCalicoValidate]
 	if found {
 		return oceanbaseconst.CNICalico
 	}
+	// check annotation for kube-ovn
+	_, found = pod.Annotations[oceanbaseconst.AnnotationKubeOvnValidate]
+	if found {
+		return oceanbaseconst.CNIKubeOvn
+	}
 	return oceanbaseconst.CNIUnknown
 }
 
@@ -31,6 +37,9 @@ func NeedAnnotation(pod *corev1.Pod, cni string) bool {
 	case oceanbaseconst.CNICalico:
 		_, found := pod.Annotations[oceanbaseconst.AnnotationCalicoIpAddrs]
 		return !found
+	case oceanbaseconst.CNIKubeOvn:
+		_, found := pod.Annotations[oceanbaseconst.AnnotationKubeOvnIpAddrs]
+		return !found
 	default:
 		return false
 	}