diff --git a/api-runtime/common-runtime/ClusterManager.go b/api-runtime/common-runtime/ClusterManager.go
index ea05bfc2e..e1d198728 100644
--- a/api-runtime/common-runtime/ClusterManager.go
+++ b/api-runtime/common-runtime/ClusterManager.go
@@ -960,8 +960,11 @@ func ListCluster(connectionName string, rsType string, kubeconfigType string) ([
if err != nil {
clusterSPLock.RUnlock(connectionName, iidInfo.NameId)
if checkNotFoundError(err) {
- cblog.Error(err)
- info = cres.ClusterInfo{IId: cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId}}
+ cblog.Infof("Cluster '%s' not found on CSP, marking as NotFound", iidInfo.NameId)
+ info = cres.ClusterInfo{
+ IId: cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId},
+ Status: cres.ClusterNotFound,
+ }
infoList2 = append(infoList2, &info)
continue
}
@@ -1078,6 +1081,14 @@ func GetCluster(connectionName string, rsType string, clusterName string, kubeco
// (2) get resource(SystemId)
info, err := handler.GetCluster(getDriverIID(cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId}))
if err != nil {
+ if checkNotFoundError(err) {
+ cblog.Info("Cluster not found on CSP, returning NotFound status")
+ notFoundInfo := cres.ClusterInfo{
+ IId: getUserIID(cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId}),
+ Status: cres.ClusterNotFound,
+ }
+ return ¬FoundInfo, nil
+ }
cblog.Error(err)
return nil, err
}
@@ -1985,17 +1996,102 @@ func DeleteCluster(connectionName string, rsType string, nameID string, force st
}
}
- // (3) delete IID
- _, err = infostore.DeleteByConditions(&ClusterIIDInfo{}, CONNECTION_NAME_COLUMN, iidInfo.ConnectionName, NAME_ID_COLUMN, nameID)
+ return result, nil
+}
+
+// FinalizeDeleteCluster deletes the Spider meta information for a Cluster
+// only when the Cluster no longer exists on the CSP.
+// (1) Check the Cluster existence in MetaDB
+// (2) Check the Cluster existence on CSP via GetCluster()
+// (3) If the Cluster does not exist on CSP, delete the meta information
+func FinalizeDeleteCluster(connectionName string, rsType string, nameID string) (bool, error) {
+ cblog.Info("call FinalizeDeleteCluster()")
+
+ // check empty and trim user inputs
+ connectionName, err := EmptyCheckAndTrim("connectionName", connectionName)
if err != nil {
cblog.Error(err)
- if force != "true" {
+ return false, err
+ }
+
+ if err := checkCapability(connectionName, CLUSTER_HANDLER); err != nil {
+ return false, err
+ }
+
+ nameID, err = EmptyCheckAndTrim("nameID", nameID)
+ if err != nil {
+ cblog.Error(err)
+ return false, err
+ }
+
+ cldConn, err := ccm.GetCloudConnection(connectionName)
+ if err != nil {
+ cblog.Error(err)
+ return false, err
+ }
+
+ handler, err := cldConn.CreateClusterHandler()
+ if err != nil {
+ cblog.Error(err)
+ return false, err
+ }
+
+ clusterSPLock.Lock(connectionName, nameID)
+ defer clusterSPLock.Unlock(connectionName, nameID)
+
+ // (1) get spiderIID for creating driverIID
+ var iidInfo *ClusterIIDInfo
+ var iidInfoList []*ClusterIIDInfo
+ if os.Getenv("PERMISSION_BASED_CONTROL_MODE") != "" {
+ err = getAuthIIDInfoList(connectionName, &iidInfoList)
+ if err != nil {
+ cblog.Error(err)
return false, err
}
+ } else {
+ err = infostore.ListByCondition(&iidInfoList, CONNECTION_NAME_COLUMN, connectionName)
+ if err != nil {
+ cblog.Error(err)
+ return false, err
+ }
+ }
+ var found = false
+ for _, OneIIdInfo := range iidInfoList {
+ if OneIIdInfo.NameId == nameID {
+ iidInfo = OneIIdInfo
+ found = true
+ break
+ }
+ }
+ if !found {
+ err := fmt.Errorf("%s '%s' does not exist in Spider's MetaDB for connection '%s'", RSTypeString(rsType), nameID, connectionName)
+ cblog.Error(err)
+ return false, err
}
- // for NodeGroup list
- // delete all nodegroups of target Cluster
+ // (2) Check the Cluster existence on CSP via GetCluster()
+ driverIId := getDriverIID(cres.IID{NameId: iidInfo.NameId, SystemId: iidInfo.SystemId})
+ _, err = handler.(cres.ClusterHandler).GetCluster(driverIId)
+ if err != nil {
+ if !checkNotFoundError(err) {
+ // unexpected error from CSP
+ cblog.Error(err)
+ return false, fmt.Errorf("failed to check Cluster existence on CSP: %w", err)
+ }
+ // Cluster does not exist on CSP => proceed to finalize
+ } else {
+ // Cluster still exists on CSP => cannot finalize
+ return false, fmt.Errorf("cannot finalize: Cluster '%s' still exists on CSP (status is not %s)", nameID, cres.ClusterNotFound)
+ }
+
+ // (3) delete IID from MetaDB
+ _, err = infostore.DeleteByConditions(&ClusterIIDInfo{}, CONNECTION_NAME_COLUMN, iidInfo.ConnectionName, NAME_ID_COLUMN, nameID)
+ if err != nil {
+ cblog.Error(err)
+ return false, err
+ }
+
+ // delete all nodegroups of target Cluster from MetaDB
_, err = infostore.DeleteByConditions(&NodeGroupIIDInfo{}, CONNECTION_NAME_COLUMN, iidInfo.ConnectionName,
OWNER_CLUSTER_NAME_COLUMN, iidInfo.NameId)
if err != nil {
@@ -2003,7 +2099,7 @@ func DeleteCluster(connectionName string, rsType string, nameID string, force st
return false, err
}
- return result, nil
+ return true, nil
}
func CountAllClusters() (int64, error) {
diff --git a/api-runtime/rest-runtime/CBSpiderRuntime.go b/api-runtime/rest-runtime/CBSpiderRuntime.go
index 8a51b07d1..35be7d2ac 100644
--- a/api-runtime/rest-runtime/CBSpiderRuntime.go
+++ b/api-runtime/rest-runtime/CBSpiderRuntime.go
@@ -473,6 +473,7 @@ func getRoutes() []route {
{"GET", "/cluster", ListCluster},
{"GET", "/cluster/:Name", GetCluster},
{"DELETE", "/cluster/:Name", DeleteCluster},
+ {"DELETE", "/cluster/:Name/finalize", FinalizeDeleteCluster},
{"GET", "/cluster/:Name/token", GetClusterToken},
//-- for NodeGroup
{"POST", "/cluster/:Name/nodegroup", AddNodeGroup},
diff --git a/api-runtime/rest-runtime/ClusterRest.go b/api-runtime/rest-runtime/ClusterRest.go
index a206f16ca..e7e3cd160 100644
--- a/api-runtime/rest-runtime/ClusterRest.go
+++ b/api-runtime/rest-runtime/ClusterRest.go
@@ -549,7 +549,7 @@ func ChangeNodeGroupScaling(c echo.Context) error {
// deleteCluster godoc
// @ID delete-cluster
// @Summary Delete Cluster
-// @Description Delete a specified Cluster.
+// @Description Delete a specified Cluster from the CSP. Cluster Management
- Delete
+ Delete
+ |
+ Finalize
@@ -655,7 +658,9 @@ Cluster Management
NodeGroups Info
Tags
Misc
-
+
{{range $index, $cluster := .Clusters}}
@@ -666,11 +671,11 @@ Cluster Management
{{$cluster.IId.NameId}} • {{$cluster.IId.SystemId}}
{{$cluster.Version}}
+ {{if ne (printf "%s" $cluster.Status) "NotFound"}}{{$cluster.Version}}{{end}}
{{$cluster.Status}}
- {{if $cluster.Status}}
+ {{if and $cluster.Status (ne (printf "%s" $cluster.Status) "NotFound")}}
- {{if $cluster.Status}}
+ {{if and $cluster.Status (ne (printf "%s" $cluster.Status) "NotFound")}}
{{if $cluster.Addons.KeyValueList}}
{{len $cluster.Addons.KeyValueList}} items
View Details
@@ -694,7 +699,7 @@ Cluster Management
- {{if $cluster.Status}}
+ {{if and $cluster.Status (ne (printf "%s" $cluster.Status) "NotFound")}}
- {{if $cluster.Status}}
+ {{if and $cluster.Status (ne (printf "%s" $cluster.Status) "NotFound")}}
Name
@@ -731,7 +736,7 @@ Cluster Management
- {{if $cluster.Status}}
+ {{if and $cluster.Status (ne (printf "%s" $cluster.Status) "NotFound")}}
{{range $tag := $cluster.TagList}}
{{$tag.Key}}: {{$tag.Value}}
{{end}}
@@ -742,6 +747,7 @@ Cluster Management
+ {{if ne (printf "%s" $cluster.Status) "NotFound"}}
{{range $kv := $cluster.KeyValueList}}
{{$kv.Key}}: {{$kv.Value}}
Cluster Management
{{if $cluster.KeyValueList}}
more...
{{end}}
+ {{end}}
-
{{end}}
{{if not .Clusters}}
@@ -1107,12 +1114,155 @@ System ID (Managed by CSP)
}
- function toggleSelectAll(selectAllCheckbox) {
+ function toggleSelectAllDelete(selectAllCheckbox) {
+ // Select only non-NotFound clusters
+ clearAllSelections();
const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
-
checkboxes.forEach((checkbox) => {
- checkbox.checked = selectAllCheckbox.checked;
+ if (checkbox.dataset.status !== 'NotFound') {
+ checkbox.checked = selectAllCheckbox.checked;
+ } else {
+ checkbox.checked = false;
+ }
});
+ // Uncheck the finalize select-all
+ document.getElementById('selectAllFinalize').checked = false;
+ document.getElementById('selectAllColumn').checked = false;
+ updateCheckboxStates();
+ }
+
+ function toggleSelectAllFinalize(selectAllCheckbox) {
+ // Select only NotFound clusters
+ clearAllSelections();
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
+ checkboxes.forEach((checkbox) => {
+ if (checkbox.dataset.status === 'NotFound') {
+ checkbox.checked = selectAllCheckbox.checked;
+ } else {
+ checkbox.checked = false;
+ }
+ });
+ // Uncheck the delete select-all
+ document.getElementById('selectAllDelete').checked = false;
+ document.getElementById('selectAllColumn').checked = false;
+ updateCheckboxStates();
+ }
+
+ function toggleSelectAllColumn(selectAllCheckbox) {
+ // Determine current selection mode from already checked items
+ const checked = document.querySelectorAll('input[name="deleteCheckbox"]:checked');
+ if (checked.length === 0) {
+ // No selection yet: select all non-NotFound (delete mode) by default
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
+ checkboxes.forEach((checkbox) => {
+ if (checkbox.dataset.status !== 'NotFound') {
+ checkbox.checked = selectAllCheckbox.checked;
+ }
+ });
+ } else {
+ // Follow current mode
+ const mode = getSelectionMode();
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
+ checkboxes.forEach((checkbox) => {
+ if (mode === 'notfound' && checkbox.dataset.status === 'NotFound') {
+ checkbox.checked = selectAllCheckbox.checked;
+ } else if (mode === 'normal' && checkbox.dataset.status !== 'NotFound') {
+ checkbox.checked = selectAllCheckbox.checked;
+ }
+ });
+ }
+ updateCheckboxStates();
+ }
+
+ function clearAllSelections() {
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
+ checkboxes.forEach((checkbox) => {
+ checkbox.checked = false;
+ });
+ }
+
+ // Returns 'notfound', 'normal', or null
+ function getSelectionMode() {
+ const checked = document.querySelectorAll('input[name="deleteCheckbox"]:checked');
+ if (checked.length === 0) return null;
+ const firstStatus = checked[0].dataset.status;
+ return firstStatus === 'NotFound' ? 'notfound' : 'normal';
+ }
+
+ function onClusterCheckboxChange(changedCheckbox) {
+ updateCheckboxStates();
+ }
+
+ function updateCheckboxStates() {
+ const mode = getSelectionMode();
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]');
+ const btnDelete = document.getElementById('btnDelete');
+ const btnFinalize = document.getElementById('btnFinalize');
+
+ checkboxes.forEach((checkbox) => {
+ const isNotFound = checkbox.dataset.status === 'NotFound';
+ const row = checkbox.closest('tr');
+
+ if (mode === null) {
+ // No selection: all enabled
+ checkbox.disabled = false;
+ row.style.opacity = '1';
+ row.title = '';
+ } else if (mode === 'notfound') {
+ if (isNotFound) {
+ checkbox.disabled = false;
+ row.style.opacity = '1';
+ row.title = '';
+ } else {
+ checkbox.disabled = true;
+ checkbox.checked = false;
+ row.style.opacity = '0.45';
+ row.title = 'Cannot mix: NotFound clusters are selected. Deselect them first to select active clusters.';
+ }
+ } else {
+ // mode === 'normal'
+ if (!isNotFound) {
+ checkbox.disabled = false;
+ row.style.opacity = '1';
+ row.title = '';
+ } else {
+ checkbox.disabled = true;
+ checkbox.checked = false;
+ row.style.opacity = '0.45';
+ row.title = 'Cannot mix: Active clusters are selected. Deselect them first to select NotFound clusters.';
+ }
+ }
+ });
+
+ // Enable/disable header buttons based on selection mode
+ if (mode === 'notfound') {
+ btnDelete.disabled = true;
+ btnDelete.style.opacity = '0.4';
+ btnDelete.style.cursor = 'not-allowed';
+ btnFinalize.disabled = false;
+ btnFinalize.style.opacity = '1';
+ btnFinalize.style.cursor = 'pointer';
+ } else if (mode === 'normal') {
+ btnDelete.disabled = false;
+ btnDelete.style.opacity = '1';
+ btnDelete.style.cursor = 'pointer';
+ btnFinalize.disabled = true;
+ btnFinalize.style.opacity = '0.4';
+ btnFinalize.style.cursor = 'not-allowed';
+ } else {
+ // No selection: both enabled
+ btnDelete.disabled = false;
+ btnDelete.style.opacity = '1';
+ btnDelete.style.cursor = 'pointer';
+ btnFinalize.disabled = false;
+ btnFinalize.style.opacity = '1';
+ btnFinalize.style.cursor = 'pointer';
+ }
+ }
+
+ // Legacy wrapper kept for table header checkbox
+ function toggleSelectAll(selectAllCheckbox) {
+ toggleSelectAllColumn(selectAllCheckbox);
}
@@ -1151,6 +1301,41 @@ System ID (Managed by CSP)
});
}
+ function finalizeSelectedClusters() {
+ const checkboxes = document.querySelectorAll('input[name="deleteCheckbox"]:checked');
+ if (checkboxes.length === 0) {
+ alert("Please select clusters to finalize.");
+ return;
+ }
+
+ if (!confirm("Are you sure you want to finalize the selected clusters?\n\nThis will remove Spider meta information only if the cluster no longer exists on the CSP.")) {
+ return;
+ }
+
+ const finalizePromises = Array.from(checkboxes).map(checkbox => {
+ const clusterName = checkbox.value;
+
+ return fetchWithProgress(`/spider/cluster/${clusterName}/finalize`, {
+ method: 'DELETE',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ ConnectionName: "{{.ConnectionConfig}}" })
+ }).then(response => {
+ if (!response.ok) {
+ return response.json().then(error => { throw new Error(error.message); });
+ }
+ return response.json();
+ });
+ });
+
+ Promise.all(finalizePromises)
+ .then(() => {
+ location.reload();
+ })
+ .catch(error => {
+ alert("Error finalizing clusters: " + error.message);
+ });
+ }
+
function showClusterTagOverlay(event, tag, resourceType, resourceName) {
event.stopPropagation();
@@ -1377,7 +1562,7 @@ System ID (Managed by CSP)
switch (providerName.toUpperCase()) {
case 'AZURE':
- versionInput.value = '1.30.3';
+ versionInput.value = '1.34.3';
vmSpecInput.value = 'Standard_B2s';
break;
case 'NHNCLOUD':
@@ -1542,7 +1727,7 @@ System ID (Managed by CSP)
function showError(message, title) {
const errorDiv = document.createElement('div');
errorDiv.className = 'error-message';
- const formattedMessage = message.split('.').join('.${title}
${formattedMessage}
OK `;
document.body.appendChild(errorDiv);
document.addEventListener('keydown', handleEscError);
diff --git a/api-runtime/rest-runtime/admin-web/html/vm.html b/api-runtime/rest-runtime/admin-web/html/vm.html
index db6a6a53a..3a5631e52 100644
--- a/api-runtime/rest-runtime/admin-web/html/vm.html
+++ b/api-runtime/rest-runtime/admin-web/html/vm.html
@@ -3866,12 +3866,6 @@ MC-Insight API Token Req
// Get current connection info and set filters
getConnectionInfo().then(info => {
- if (!info.zone) {
- alert('Cannot determine Zone from selected Subnet. Please select a valid Subnet.');
- closeImageSelectionOverlay();
- return;
- }
-
// For OpenStack and MOCK, skip MC-Insight token check and load filters directly
if (info.csp.toLowerCase() === 'openstack' || info.csp.toLowerCase() === 'mock') {
loadImageFilterOptions(info.csp, info.region, info.zone);
@@ -4042,6 +4036,7 @@ MC-Insight API Token Req
// Populate Region/Zone (cloud_hierarchy)
if (data.cloud_hierarchy && data.cloud_hierarchy[actualCsp]) {
const regions = Object.keys(data.cloud_hierarchy[actualCsp]);
+ let regionFound = false;
regions.forEach(region => {
const option = document.createElement('option');
@@ -4049,6 +4044,7 @@ MC-Insight API Token Req
option.textContent = region;
if (region === currentRegion) {
option.selected = true;
+ regionFound = true;
}
regionSelect.appendChild(option);
});
@@ -4056,6 +4052,10 @@ MC-Insight API Token Req
regionSelect.disabled = true;
regionSelect.style.backgroundColor = '#f0f0f0';
+ if (!regionFound) {
+ alert(`MC-Insight does not have image data for the current region: ${currentRegion}`);
+ }
+
const zones = data.cloud_hierarchy[actualCsp][currentRegion];
if (zones && zones.length > 0) {
@@ -4767,12 +4767,6 @@ MC-Insight API Token Req
// Get current connection info and set filters
getConnectionInfo().then(info => {
- if (!info.zone) {
- alert('Cannot determine Zone from selected Subnet. Please select a valid Subnet.');
- closeSpecSelectionOverlay();
- return;
- }
-
// For OpenStack and MOCK, skip MC-Insight token check and load filters directly
if (info.csp.toLowerCase() === 'openstack' || info.csp.toLowerCase() === 'mock') {
loadSpecFilterOptions(info.csp, info.region, info.zone);
@@ -5264,6 +5258,7 @@ MC-Insight API Token Req
// Populate Region/Zone (cloud_hierarchy)
if (data.cloud_hierarchy && data.cloud_hierarchy[actualCsp]) {
const regions = Object.keys(data.cloud_hierarchy[actualCsp]);
+ let regionFound = false;
regions.forEach(region => {
const option = document.createElement('option');
@@ -5271,6 +5266,7 @@ MC-Insight API Token Req
option.textContent = region;
if (region === currentRegion) {
option.selected = true;
+ regionFound = true;
}
regionSelect.appendChild(option);
});
@@ -5278,6 +5274,10 @@ MC-Insight API Token Req
regionSelect.disabled = true;
regionSelect.style.backgroundColor = '#f0f0f0';
+ if (!regionFound) {
+ alert(`MC-Insight does not have spec data for the current region: ${currentRegion}`);
+ }
+
const zones = data.cloud_hierarchy[actualCsp][currentRegion];
if (zones && zones.length > 0) {
diff --git a/api-runtime/rest-runtime/admin-web/html/vpc-subnet.html b/api-runtime/rest-runtime/admin-web/html/vpc-subnet.html
index 30b054f96..1fe3ca879 100644
--- a/api-runtime/rest-runtime/admin-web/html/vpc-subnet.html
+++ b/api-runtime/rest-runtime/admin-web/html/vpc-subnet.html
@@ -1050,10 +1050,11 @@ System ID (Managed by CSP)
const vpcCIDR = document.getElementById('vpcCIDR').value;
const subnetName = document.getElementById('subnetName').value;
const subnetCIDR = document.getElementById('subnetCIDR').value;
- const subnetZone = document.getElementById('subnetZone').value;
+ const subnetZoneEl = document.getElementById('subnetZone');
+ const subnetZone = subnetZoneEl.value;
const vpcCount = document.getElementById('vpcCount').value;
- if (!vpcName || !vpcCIDR || !subnetName || !subnetCIDR || !subnetZone || !vpcCount) {
+ if (!vpcName || !vpcCIDR || !subnetName || !subnetCIDR || !vpcCount || (subnetZoneEl.hasAttribute('required') && !subnetZone)) {
alert("Please fill in all the fields.");
return false;
}
@@ -1875,7 +1876,18 @@ System ID (Managed by CSP)
.then(response => response.json())
.then(data => {
zoneSelect.innerHTML = '';
- data.ZoneList.forEach(zone => {
+ const zones = data.ZoneList || [];
+ if (zones.length === 0) {
+ zoneSelect.removeAttribute('required');
+ const option = document.createElement('option');
+ option.value = '';
+ option.textContent = 'No Zone Available';
+ option.selected = true;
+ zoneSelect.appendChild(option);
+ return;
+ }
+ zoneSelect.setAttribute('required', 'required');
+ zones.forEach(zone => {
const option = document.createElement('option');
option.value = zone.Name;
option.textContent = `${zone.Name} (${zone.DisplayName})`;
diff --git a/api/docs.go b/api/docs.go
index 17ae4aba3..d496e4196 100644
--- a/api/docs.go
+++ b/api/docs.go
@@ -1174,7 +1174,7 @@ const docTemplate = `{
}
},
"delete": {
- "description": "Delete a specified Cluster.",
+ "description": "Delete a specified Cluster from the CSP. \u003cbr\u003e This API only deletes the CSP resource and does not remove Spider meta information. \u003cbr\u003e After deletion, call **DELETE /cluster/{Name}/finalize** to clean up Spider's internal metadata once the CSP resource no longer exists.",
"consumes": [
"application/json"
],
@@ -1238,6 +1238,66 @@ const docTemplate = `{
}
}
},
+ "/cluster/{Name}/finalize": {
+ "delete": {
+ "description": "Finalize the deletion of a Cluster by removing its Spider meta information.\nThis API only succeeds when the Cluster no longer exists on the CSP.\nUse this after DeleteCluster to clean up Spider's internal metadata.",
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "[Cluster Management]"
+ ],
+ "summary": "Finalize Delete Cluster",
+ "operationId": "finalize-delete-cluster",
+ "parameters": [
+ {
+ "description": "Request body for finalizing Cluster deletion",
+ "name": "ConnectionRequest",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/spider.ConnectionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "The name of the Cluster to finalize deletion",
+ "name": "Name",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Result of the finalize delete operation",
+ "schema": {
+ "$ref": "#/definitions/spider.BooleanInfo"
+ }
+ },
+ "400": {
+ "description": "Bad Request, possibly due to invalid JSON structure or missing fields",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ },
+ "404": {
+ "description": "Resource Not Found",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ },
+ "500": {
+ "description": "Internal Server Error",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ }
+ }
+ }
+ },
"/cluster/{Name}/nodegroup": {
"post": {
"description": "Add a new Node Group to an existing Cluster.",
@@ -11315,14 +11375,16 @@ const docTemplate = `{
"Active",
"Inactive",
"Updating",
- "Deleting"
+ "Deleting",
+ "NotFound"
],
"x-enum-varnames": [
"ClusterCreating",
"ClusterActive",
"ClusterInactive",
"ClusterUpdating",
- "ClusterDeleting"
+ "ClusterDeleting",
+ "ClusterNotFound"
]
},
"spider.CronSchedule": {
diff --git a/api/swagger.json b/api/swagger.json
index b1ff1d94d..010bdd21a 100644
--- a/api/swagger.json
+++ b/api/swagger.json
@@ -1171,7 +1171,7 @@
}
},
"delete": {
- "description": "Delete a specified Cluster.",
+ "description": "Delete a specified Cluster from the CSP. \u003cbr\u003e This API only deletes the CSP resource and does not remove Spider meta information. \u003cbr\u003e After deletion, call **DELETE /cluster/{Name}/finalize** to clean up Spider's internal metadata once the CSP resource no longer exists.",
"consumes": [
"application/json"
],
@@ -1235,6 +1235,66 @@
}
}
},
+ "/cluster/{Name}/finalize": {
+ "delete": {
+ "description": "Finalize the deletion of a Cluster by removing its Spider meta information.\nThis API only succeeds when the Cluster no longer exists on the CSP.\nUse this after DeleteCluster to clean up Spider's internal metadata.",
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "[Cluster Management]"
+ ],
+ "summary": "Finalize Delete Cluster",
+ "operationId": "finalize-delete-cluster",
+ "parameters": [
+ {
+ "description": "Request body for finalizing Cluster deletion",
+ "name": "ConnectionRequest",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/spider.ConnectionRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "The name of the Cluster to finalize deletion",
+ "name": "Name",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Result of the finalize delete operation",
+ "schema": {
+ "$ref": "#/definitions/spider.BooleanInfo"
+ }
+ },
+ "400": {
+ "description": "Bad Request, possibly due to invalid JSON structure or missing fields",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ },
+ "404": {
+ "description": "Resource Not Found",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ },
+ "500": {
+ "description": "Internal Server Error",
+ "schema": {
+ "$ref": "#/definitions/spider.SimpleMsg"
+ }
+ }
+ }
+ }
+ },
"/cluster/{Name}/nodegroup": {
"post": {
"description": "Add a new Node Group to an existing Cluster.",
@@ -11312,14 +11372,16 @@
"Active",
"Inactive",
"Updating",
- "Deleting"
+ "Deleting",
+ "NotFound"
],
"x-enum-varnames": [
"ClusterCreating",
"ClusterActive",
"ClusterInactive",
"ClusterUpdating",
- "ClusterDeleting"
+ "ClusterDeleting",
+ "ClusterNotFound"
]
},
"spider.CronSchedule": {
diff --git a/api/swagger.yaml b/api/swagger.yaml
index 70a9fbc44..5dc5559cf 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -316,6 +316,7 @@ definitions:
- Inactive
- Updating
- Deleting
+ - NotFound
type: string
x-enum-varnames:
- ClusterCreating
@@ -323,6 +324,7 @@ definitions:
- ClusterInactive
- ClusterUpdating
- ClusterDeleting
+ - ClusterNotFound
spider.CronSchedule:
properties:
DayOfMonth:
@@ -4245,7 +4247,10 @@ paths:
delete:
consumes:
- application/json
- description: Delete a specified Cluster.
+ description: Delete a specified Cluster from the CSP.