modify subnet and ip crds

dist/images/install.sh

@@ -237,9 +237,12 @@ spec:
       served: true
       storage: true
       additionalPrinterColumns:
-      - name: IP
+      - name: V4IP
         type: string
-        jsonPath: .spec.ipAddress
+        jsonPath: .spec.v4IpAddress
+      - name: V6IP
+        type: string
+        jsonPath: .spec.v6IpAddress
       - name: Mac
         type: string
         jsonPath: .spec.macAddress
@@ -270,6 +273,10 @@ spec:
                   type: string
                 ipAddress:
                   type: string
+                v4IpAddress:
+                  type: string
+                v6IpAddress:
+                  type: string
                 attachIps:
                   type: array
                   items:
@@ -327,22 +334,32 @@ spec:
       - name: GatewayType
         type: string
         jsonPath: .spec.gatewayType
-      - name: Used
+      - name: V4Used
+        type: number
+        jsonPath: .status.v4usingIPs
+      - name: V4Available
         type: number
-        jsonPath: .status.usingIPs
-      - name: Available
+        jsonPath: .status.v4availableIPs
+      - name: V6Used
         type: number
-        jsonPath: .status.availableIPs
+        jsonPath: .status.v6usingIPs
+      - name: V6Available
+        type: number
+        jsonPath: .status.v6availableIPs
       schema:
         openAPIV3Schema:
           type: object
           properties:
             status:
               type: object
               properties:
-                availableIPs:
+                v4availableIPs:
+                  type: number
+                v4usingIPs:
+                  type: number
+                v6availableIPs:
                   type: number
-                usingIPs:
+                v6usingIPs:
                   type: number
                 activateGateway:
                   type: string

pkg/apis/kubeovn/v1/types.go

@@ -45,6 +45,8 @@ type IPSpec struct {
 	AttachSubnets []string `json:"attachSubnets"`
 	NodeName      string   `json:"nodeName"`
 	IPAddress     string   `json:"ipAddress"`
+	V4IPAddress   string   `json:"v4IpAddress"`
+	V6IPAddress   string   `json:"v6IpAddress"`
 	AttachIPs     []string `json:"attachIps"`
 	MacAddress    string   `json:"macAddress"`
 	AttachMacs    []string `json:"attachMacs"`

pkg/controller/controller.go

@@ -312,6 +312,12 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 	}
 
 	c.registerSubnetMetrics()
+	if err := c.initSyncCrdIPs(); err != nil {
+		klog.Errorf("failed to sync crd ips %v", err)
+	}
+	if err := c.initSyncCrdSubnets(); err != nil {
+		klog.Errorf("failed to sync crd subnets %v", err)
+	}
 
 	// start workers to do all the network operations
 	c.startWorkers(stopCh)

pkg/controller/init.go

@@ -11,6 +11,8 @@ import (
 
 	kubeovnv1 "github.com/alauda/kube-ovn/pkg/apis/kubeovn/v1"
 	"github.com/alauda/kube-ovn/pkg/util"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
 )
@@ -308,3 +310,52 @@ func (c *Controller) initDefaultVlan() error {
 	_, err = c.config.KubeOvnClient.KubeovnV1().Vlans().Create(context.Background(), &defaultVlan, v1.CreateOptions{})
 	return err
 }
+
+func (c *Controller) initSyncCrdIPs() error {
+	ips, err := c.config.KubeOvnClient.KubeovnV1().IPs().List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+
+	for _, ipCr := range ips.Items {
+		ip := ipCr
+		v4IP, v6IP := util.SplitStringIP(ip.Spec.IPAddress)
+		if ip.Spec.V4IPAddress == v4IP && ip.Spec.V6IPAddress == v6IP {
+			continue
+		}
+		ip.Spec.V4IPAddress = v4IP
+		ip.Spec.V6IPAddress = v6IP
+
+		_, err := c.config.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), &ip, metav1.UpdateOptions{})
+		if err != nil {
+			klog.Errorf("failed to sync crd ip %s, %v", ip.Spec.IPAddress, err)
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *Controller) initSyncCrdSubnets() error {
+	subnets, err := c.subnetsLister.List(labels.Everything())
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+	for _, subnet := range subnets {
+		if util.CheckProtocol(subnet.Spec.CIDRBlock) == kubeovnv1.ProtocolDual {
+			err = calcDualSubnetStatusIP(subnet, c)
+		} else {
+			err = calcSubnetStatusIP(subnet, c)
+		}
+		if err != nil {
+			klog.Errorf("failed to calculate subnet %s used ip, %v", subnet.Name, err)
+			return err
+		}
+	}
+	return nil
+}

pkg/controller/node.go

@@ -348,6 +348,7 @@ func getNodeInternalIP(node *v1.Node) string {
 }
 
 func (c *Controller) createOrUpdateCrdIPs(key, ip, mac string) error {
+	v4IP, v6IP := util.SplitStringIP(ip)
 	ipCr, err := c.config.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), fmt.Sprintf("node-%s", key), metav1.GetOptions{})
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
@@ -364,6 +365,8 @@ func (c *Controller) createOrUpdateCrdIPs(key, ip, mac string) error {
 					Subnet:        c.config.NodeSwitch,
 					NodeName:      key,
 					IPAddress:     ip,
+					V4IPAddress:   v4IP,
+					V6IPAddress:   v6IP,
 					MacAddress:    mac,
 					AttachIPs:     []string{},
 					AttachMacs:    []string{},
@@ -393,6 +396,8 @@ func (c *Controller) createOrUpdateCrdIPs(key, ip, mac string) error {
 		ipCr.Spec.Subnet = c.config.NodeSwitch
 		ipCr.Spec.NodeName = key
 		ipCr.Spec.IPAddress = ip
+		ipCr.Spec.V4IPAddress = v4IP
+		ipCr.Spec.V6IPAddress = v6IP
 		ipCr.Spec.MacAddress = mac
 		ipCr.Spec.ContainerID = ""
 		_, err := c.config.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), ipCr, metav1.UpdateOptions{})

pkg/daemon/handler.go

@@ -119,6 +119,7 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 }
 
 func (csh cniServerHandler) createOrUpdateIPCr(podRequest request.CniRequest, subnet, ip, macAddr string) error {
+	v4IP, v6IP := util.SplitStringIP(ip)
 	ipCr, err := csh.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), fmt.Sprintf("%s.%s", podRequest.PodName, podRequest.PodNamespace), metav1.GetOptions{})
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
@@ -136,6 +137,8 @@ func (csh cniServerHandler) createOrUpdateIPCr(podRequest request.CniRequest, su
 					Subnet:        subnet,
 					NodeName:      csh.Config.NodeName,
 					IPAddress:     ip,
+					V4IPAddress:   v4IP,
+					V6IPAddress:   v6IP,
 					MacAddress:    macAddr,
 					ContainerID:   podRequest.ContainerID,
 					AttachIPs:     []string{},

pkg/util/net.go

@@ -274,3 +274,17 @@ func GetIpWithoutMask(ipStr string) string {
 	}
 	return strings.Join(ips, ",")
 }
+
+func SplitStringIP(ipStr string) (string, string) {
+	var v4IP, v6IP string
+	if CheckProtocol(ipStr) == kubeovnv1.ProtocolDual {
+		v4IP = strings.Split(ipStr, ",")[0]
+		v6IP = strings.Split(ipStr, ",")[1]
+	} else if CheckProtocol(ipStr) == kubeovnv1.ProtocolIPv4 {
+		v4IP = ipStr
+	} else if CheckProtocol(ipStr) == kubeovnv1.ProtocolIPv6 {
+		v6IP = ipStr
+	}
+
+	return v4IP, v6IP
+}

test/e2e/ip/static_ip.go

@@ -60,7 +60,7 @@ var _ = Describe("[IP Allocation]", func() {
 			time.Sleep(1 * time.Second)
 			ip, err := f.OvnClientSet.KubeovnV1().IPs().Get(context.Background(), fmt.Sprintf("%s.%s", name, namespace), metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(ip.Spec.IPAddress).To(Equal("12.10.0.10"))
+			Expect(ip.Spec.V4IPAddress).To(Equal("12.10.0.10"))
 			Expect(ip.Spec.MacAddress).To(Equal("00:00:00:53:6B:B6"))
 		})
 

test/e2e/subnet/normal.go

@@ -80,8 +80,8 @@ var _ = Describe("[Subnet]", func() {
 
 			By("validate status")
 			Expect(subnet.Status.ActivateGateway).To(BeEmpty())
-			Expect(subnet.Status.AvailableIPs).To(Equal(float64(65533)))
-			Expect(subnet.Status.UsingIPs).To(BeZero())
+			Expect(subnet.Status.V4AvailableIPs).To(Equal(float64(65533)))
+			Expect(subnet.Status.V4UsingIPs).To(BeZero())
 
 			pods, err := f.KubeClientSet.CoreV1().Pods("kube-system").List(context.Background(), metav1.ListOptions{LabelSelector: "app=ovs"})
 			Expect(err).NotTo(HaveOccurred())
@@ -234,7 +234,7 @@ var _ = Describe("[Subnet]", func() {
 
 			s, err = f.OvnClientSet.KubeovnV1().Subnets().Get(context.Background(), name, metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(s.Status.AvailableIPs).To(Equal(float64(0)))
+			Expect(s.Status.V4AvailableIPs).To(Equal(float64(0)))
 		})
 
 		It("small cidr", func() {
@@ -257,7 +257,7 @@ var _ = Describe("[Subnet]", func() {
 
 			s, err = f.OvnClientSet.KubeovnV1().Subnets().Get(context.Background(), name, metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(s.Status.AvailableIPs).To(Equal(float64(1)))
+			Expect(s.Status.V4AvailableIPs).To(Equal(float64(1)))
 		})
 
 		It("with excludeips", func() {
@@ -280,7 +280,7 @@ var _ = Describe("[Subnet]", func() {
 
 			s, err = f.OvnClientSet.KubeovnV1().Subnets().Get(context.Background(), name, metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(s.Status.AvailableIPs).To(Equal(float64(244)))
+			Expect(s.Status.V4AvailableIPs).To(Equal(float64(244)))
 		})
 	})
 })