add ip release for ip conflict situation

Signed-off-by: Icarus9913 <[email protected]>
spidernet-io · Jan 17, 2024 · 8400439 · 8400439
1 parent d990b82
commit 8400439
Show file tree

Hide file tree

Showing 22 changed files with 615 additions and 97 deletions.
diff --git a/api/v1/agent/client/daemonset/delete_ipam_ips_parameters.go b/api/v1/agent/client/daemonset/delete_ipam_ips_parameters.go
diff --git a/api/v1/agent/models/ipam_batch_del_args.go b/api/v1/agent/models/ipam_batch_del_args.go
diff --git a/api/v1/agent/openapi.yaml b/api/v1/agent/openapi.yaml
@@ -88,6 +88,12 @@ paths:
         Delete multiple ip for a pod, case for spiderflat compent
       tags:
         - daemonset
+      parameters:
+        - name: ipam-batch-del-args
+          in: body
+          required: true
+          schema:
+            $ref: "#/definitions/IpamBatchDelArgs"
       responses:
         "200":
           description: Success
@@ -347,3 +353,24 @@ definitions:
         type: string
       podNamespace:
         type: string
+  IpamBatchDelArgs:
+    description: IPAM release IPs information
+    type: object
+    properties:
+      isReleaseConflictIPs:
+        type: boolean
+      containerID:
+        type: string
+      netNamespace:
+        type: string
+      podNamespace:
+        type: string
+      podName:
+        type: string
+      podUID:
+        type: string
+    required:
+      - containerID
+      - podNamespace
+      - podName
+      - podUID
diff --git a/api/v1/agent/server/embedded_spec.go b/api/v1/agent/server/embedded_spec.go
diff --git a/api/v1/agent/server/restapi/daemonset/delete_ipam_ips_parameters.go b/api/v1/agent/server/restapi/daemonset/delete_ipam_ips_parameters.go
diff --git a/charts/spiderpool/crds/spiderpool.spidernet.io_spiderendpoints.yaml b/charts/spiderpool/crds/spiderpool.spidernet.io_spiderendpoints.yaml
@@ -98,6 +98,7 @@ spec:
                           type: array
                         vlan:
                           default: 0
+                          description: 'DEPRECATED: Vlan is deprecated.'
                           format: int64
                           maximum: 4094
                           minimum: 0