Merge pull request #942 from l1b0k/feat/enahnce

feat(eni): add IPStatusInvalid and update status handling for invalid…

Author: BSWANG

pkg/apis/crds/network.alibabacloud.com_nodes.yaml

@@ -227,6 +227,7 @@ spec:
                               address.
                             enum:
                             - Valid
+                            - Invalid
                             - Deleting
                             type: string
                         required:
@@ -257,6 +258,7 @@ spec:
                               address.
                             enum:
                             - Valid
+                            - Invalid
                             - Deleting
                             type: string
                         required:

pkg/apis/crds/register.go

@@ -58,7 +58,7 @@ func getCRD(name string) apiextensionsv1.CustomResourceDefinition {
 		version = "v0.1.0"
 	case CRDNode:
 		crdBytes = crdsNode
-		version = "v0.6.0"
+		version = "v0.6.1"
 	case CRDNodeRuntime:
 		crdBytes = crdsNodeRuntime
 		version = "v0.1.0"

pkg/apis/network.alibabacloud.com/v1beta1/node_types.go

@@ -30,11 +30,12 @@ const (
 )
 
 // IPStatus representing the status of an IP address.
-// +kubebuilder:validation:Enum=Valid;Deleting
+// +kubebuilder:validation:Enum=Valid;Invalid;Deleting
 type IPStatus string
 
 const (
 	IPStatusValid    IPStatus = "Valid"
+	IPStatusInvalid  IPStatus = "Invalid"
 	IPStatusDeleting IPStatus = "Deleting"
 )
 

pkg/controller/multi-ip/node/eni.go

@@ -168,8 +168,19 @@ func mergeIPMap(log logr.Logger, remote, current map[string]*networkv1beta1.IP)
 	for k := range current {
 		_, ok := remote[k]
 		if !ok {
-			log.Info("sync eni with remote, delete ip from local", "ip", k)
-			delete(current, k)
+			ip := current[k]
+			if ip.Primary {
+				log.Error(nil, "primary ip not in remote, but can not delete it", "ip", k)
+				continue
+			}
+
+			if ip.PodID != "" {
+				ip.Status = networkv1beta1.IPStatusInvalid
+				log.Info("ip not in remote,but in use mark as invalid", "ip", k)
+			} else {
+				log.Info("sync eni with remote, delete ip from local", "ip", k)
+				delete(current, k)
+			}
 		}
 	}
 

pkg/controller/multi-ip/node/eni_test.go

@@ -227,6 +227,75 @@ func Test_mergeIPMap(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "eflo ip not found in temote but in use",
+			args: args{
+				log: logr.Discard(),
+				remote: map[string]*networkv1beta1.IP{
+					"ipName": {
+						IP:     "",
+						IPName: "ipName",
+						Status: networkv1beta1.IPStatusDeleting,
+					},
+					"ipName2": {
+						IP:     "127.0.0.1",
+						IPName: "ipName2",
+						Status: networkv1beta1.IPStatusValid,
+					},
+				},
+				current: map[string]*networkv1beta1.IP{
+					"1": {
+						IP:     "1",
+						PodID:  "foo",
+						PodUID: "bar",
+						Status: networkv1beta1.IPStatusValid,
+					},
+				},
+			},
+			expect: map[string]*networkv1beta1.IP{
+				"ipName": {
+					IP:     "",
+					IPName: "ipName",
+					Status: networkv1beta1.IPStatusDeleting,
+				},
+				"ipName2": {
+					IP:     "127.0.0.1",
+					IPName: "ipName2",
+					Status: networkv1beta1.IPStatusValid,
+				},
+				"1": {
+					IP:     "1",
+					PodID:  "foo",
+					PodUID: "bar",
+					Status: networkv1beta1.IPStatusInvalid,
+				},
+			},
+		},
+		{
+			name: "primary case",
+			args: args{
+				log: logr.Discard(),
+				remote: map[string]*networkv1beta1.IP{
+					// somehow primary ip is not in remote
+				},
+				current: map[string]*networkv1beta1.IP{
+					"ipName": {
+						IP:      "",
+						IPName:  "ipName",
+						Primary: true,
+						Status:  networkv1beta1.IPStatusValid,
+					},
+				},
+			},
+			expect: map[string]*networkv1beta1.IP{
+				"ipName": {
+					IP:      "",
+					IPName:  "ipName",
+					Primary: true,
+					Status:  networkv1beta1.IPStatusValid,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/controller/multi-ip/node/pool.go

@@ -646,6 +646,9 @@ func releasePodNotFound(ctx context.Context, c client.Client, nodeName string, p
 			l.Info("pod released", "pod", v.IP.PodID, "ip", v.IP.IP)
 			v.IP.PodID = ""
 			v.IP.PodUID = ""
+			if v.IP.Status == networkv1beta1.IPStatusInvalid && !v.IP.Primary {
+				v.IP.Status = networkv1beta1.IPStatusDeleting
+			}
 		}
 	}
 }