add ip release for ip conflict situation

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

Hide file tree

Showing 26 changed files with 1,115 additions and 124 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/client/daemonset/delete_ipam_ips_responses.go b/api/v1/agent/client/daemonset/delete_ipam_ips_responses.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
@@ -96,6 +102,14 @@ paths:
           x-go-name: Failure
           schema:
             $ref: "#/definitions/Error"
+        '521':
+          description: Forbid to release IPs for stateless workload
+          schema:
+            $ref: "#/definitions/Error"
+        '522':
+          description: Forbid to release IPs for stateful workload
+          schema:
+            $ref: "#/definitions/Error"
   "/workloadendpoint":
     get:
       summary: Get workloadendpoint status
@@ -347,3 +361,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