Merge pull request #3941 from SujanaN08/OCPBUG-187

Bug 1846125: deleting vsphere cluster tag after deleting the attached resources

pkg/destroy/vsphere/vsphere.go

@@ -130,6 +130,15 @@ func getAttachedObjectsOnTag(ctx context.Context, client *rest.Client, tagName s
 	return attached, nil
 }
 
+func deleteTag(ctx context.Context, client *rest.Client, tagID string) error {
+	tagManager := tags.NewManager(client)
+	tag, err := tagManager.GetTag(ctx, tagID)
+	if err == nil {
+		err = tagManager.DeleteTag(ctx, tag)
+	}
+	return err
+}
+
 // Run is the entrypoint to start the uninstall process.
 func (o *ClusterUninstaller) Run() error {
 	var folderList []types.ManagedObjectReference
@@ -192,5 +201,11 @@ func (o *ClusterUninstaller) Run() error {
 		return err
 	}
 
+	o.Logger.Debug("delete tag")
+	if err = deleteTag(context.TODO(), o.RestClient, o.InfraID); err != nil {
+		o.Logger.Errorln(err)
+		return err
+	}
+
 	return nil
 }