simple vip (#5534)

* simple vip

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

* update ns

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

---------

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

Author: zbb88888

charts/kube-ovn-v2/crds/kube-ovn-crd.yaml

@@ -2269,8 +2269,6 @@ spec:
               properties:
                 type:
                   type: string
-                ready:
-                  type: boolean
                 v4ip:
                   type: string
                 v6ip:

charts/kube-ovn/templates/kube-ovn-crd.yaml

@@ -2261,6 +2261,9 @@ spec:
       served: true
       storage: true
       additionalPrinterColumns:
+      - name: Namespace
+        type: string
+        jsonPath: .spec.namespace
       - name: V4IP
         type: string
         jsonPath: .status.v4ip
@@ -2285,8 +2288,6 @@ spec:
               properties:
                 type:
                   type: string
-                ready:
-                  type: boolean
                 v4ip:
                   type: string
                 v6ip:

dist/images/install.sh

@@ -2505,6 +2505,9 @@ spec:
       served: true
       storage: true
       additionalPrinterColumns:
+      - name: Namespace
+        type: string
+        jsonPath: .spec.namespace
       - name: V4IP
         type: string
         jsonPath: .status.v4ip
@@ -3816,21 +3819,21 @@ metadata:
   name: secret-reader-ovn-ipsec
   namespace: kube-system
 rules:
-- apiGroups: 
+- apiGroups:
     - ""
-  resources: 
+  resources:
     - "secrets"
   resourceNames:
     - "ovn-ipsec-ca"
-  verbs: 
+  verbs:
     - "get"
     - "list"
     - "watch"
-- apiGroups: 
+- apiGroups:
     - "cert-manager.io"
-  resources: 
+  resources:
     - "certificaterequests"
-  verbs: 
+  verbs:
     - "get"
     - "list"
     - "create"

pkg/controller/vip.go

@@ -200,11 +200,6 @@ func (c *Controller) handleUpdateVirtualIP(key string) error {
 			klog.Error(err)
 			return err
 		}
-		ready := true
-		if err = c.patchVipStatus(key, vip.Spec.V4ip, ready); err != nil {
-			klog.Error(err)
-			return err
-		}
 		if err = c.handleAddVipFinalizer(key); err != nil {
 			klog.Errorf("failed to handle vip finalizer %v", err)
 			return err
@@ -359,8 +354,11 @@ func (c *Controller) createOrUpdateVipCR(key, ns, subnet, v4ip, v6ip, mac string
 		}
 	} else {
 		vip := vipCR.DeepCopy()
-		if vip.Status.Mac == "" && mac != "" {
-			// vip not support to update, just delete and create
+		if vip.Status.Mac == "" && mac != "" ||
+			vip.Status.V4ip == "" && v4ip != "" ||
+			vip.Status.V6ip == "" && v6ip != "" {
+			// vip spec mac or ip not support to update
+			// only set once during creation
 			vip.Spec.Namespace = ns
 			vip.Spec.V4ip = v4ip
 			vip.Spec.V6ip = v6ip
@@ -370,6 +368,7 @@ func (c *Controller) createOrUpdateVipCR(key, ns, subnet, v4ip, v6ip, mac string
 			vip.Status.V6ip = v6ip
 			vip.Status.Mac = mac
 			vip.Status.Type = vip.Spec.Type
+			// TODO:// Ready = true as subnet.Status.Ready
 			if _, err := c.config.KubeOvnClient.KubeovnV1().Vips().Update(context.Background(), vip, metav1.UpdateOptions{}); err != nil {
 				err := fmt.Errorf("failed to update vip '%s', %w", key, err)
 				klog.Error(err)
@@ -407,32 +406,6 @@ func (c *Controller) createOrUpdateVipCR(key, ns, subnet, v4ip, v6ip, mac string
 	return nil
 }
 
-func (c *Controller) patchVipStatus(key, v4ip string, ready bool) error {
-	oriVip, err := c.virtualIpsLister.Get(key)
-	if err != nil {
-		if k8serrors.IsNotFound(err) {
-			return nil
-		}
-		klog.Error(err)
-		return err
-	}
-	vip := oriVip.DeepCopy()
-	var changed bool
-
-	if ready && v4ip != "" && vip.Status.V4ip != v4ip {
-		vip.Status.V4ip = v4ip
-		changed = true
-	}
-
-	if changed {
-		if _, err = c.config.KubeOvnClient.KubeovnV1().Vips().Update(context.Background(), vip, metav1.UpdateOptions{}); err != nil {
-			klog.Errorf("failed to update status for vip '%s', %v", key, err)
-			return err
-		}
-	}
-	return nil
-}
-
 func (c *Controller) podReuseVip(vipName, portName string, keepVIP bool) error {
 	// when pod use static vip, label vip reserved for pod
 	oriVip, err := c.virtualIpsLister.Get(vipName)