Bug 1862044: deleting servers using metadata-based filtering

In openshift#3818 we introduced tag-based server delition. Unfortunately it turned out we can destroy servers, created by previous versions, as no tags were set there. To fix this situation we come back to the previous solution - deleting servers by metadata.
vrutkovs · Sep 2, 2020 · c5df75d · c5df75d
1 parent 4558ca0
commit c5df75d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/data/data/openstack/bootstrap/main.tf b/data/data/openstack/bootstrap/main.tf
@@ -58,6 +58,11 @@ resource "openstack_compute_instance_v2" "bootstrap" {
   }
 
   tags = ["openshiftClusterID=${var.cluster_id}"]
+
+  metadata = {
+    Name               = "${var.cluster_id}-bootstrap"
+    openshiftClusterID = var.cluster_id
+  }
 }
 
 resource "openstack_networking_floatingip_v2" "bootstrap_fip" {

diff --git a/data/data/openstack/masters/main.tf b/data/data/openstack/masters/main.tf
@@ -81,4 +81,9 @@ resource "openstack_compute_instance_v2" "master_conf" {
   }
 
   tags = ["openshiftClusterID=${var.cluster_id}"]
+
+  metadata = {
+    Name = "${var.cluster_id}-master"
+    openshiftClusterID = var.cluster_id
+  }
 }
diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go
@@ -156,6 +156,10 @@ func generateProvider(clusterID string, platform *openstack.Platform, mpool *ope
 		Tags: []string{
 			fmt.Sprintf("openshiftClusterID=%s", clusterID),
 		},
+		ServerMetadata: map[string]string{
+			"Name":               fmt.Sprintf("%s-%s", clusterID, role),
+			"openshiftClusterID": clusterID,
+		},
 	}
 	if mpool.RootVolume != nil {
 		spec.RootVolume = &openstackprovider.RootVolume{

diff --git a/pkg/destroy/openstack/openstack.go b/pkg/destroy/openstack/openstack.go
@@ -200,14 +200,8 @@ func deleteServers(opts *clientconfig.ClientOpts, filter Filter, logger logrus.F
 		logger.Error(err)
 		return false, nil
 	}
-	// Microversion "2.26" is the first that supports server tags
-	conn.Microversion = "2.26"
 
-	listOpts := servers.ListOpts{
-		TagsAny: strings.Join(filterTags(filter), ","),
-	}
-
-	allPages, err := servers.List(conn, listOpts).AllPages()
+	allPages, err := servers.List(conn, servers.ListOpts{}).AllPages()
 	if err != nil {
 		logger.Error(err)
 		return false, nil
@@ -219,7 +213,16 @@ func deleteServers(opts *clientconfig.ClientOpts, filter Filter, logger logrus.F
 		return false, nil
 	}
 
+	serverObjects := []ObjectWithTags{}
 	for _, server := range allServers {
+		serverObjects = append(
+			serverObjects, ObjectWithTags{
+				ID:   server.ID,
+				Tags: server.Metadata})
+	}
+
+	filteredServers := filterObjects(serverObjects, filter)
+	for _, server := range filteredServers {
 		logger.Debugf("Deleting Server %q", server.ID)
 		err = servers.Delete(conn, server.ID).ExtractErr()
 		if err != nil {
@@ -232,7 +235,7 @@ func deleteServers(opts *clientconfig.ClientOpts, filter Filter, logger logrus.F
 			logger.Debugf("Cannot find server %q. It's probably already been deleted.", server.ID)
 		}
 	}
-	return len(allServers) == 0, nil
+	return len(filteredServers) == 0, nil
 }
 
 func deleteServerGroups(opts *clientconfig.ClientOpts, filter Filter, logger logrus.FieldLogger) (bool, error) {