From 85f135729d53f2ba6bb51b4f837c56004fd725f2 Mon Sep 17 00:00:00 2001
From: ajanikow <12255597+ajanikow@users.noreply.github.com>
Date: Fri, 19 Feb 2021 21:44:18 +0000
Subject: [PATCH 1/2] Remove CleanOut Action

---
 pkg/deployment/reconcile/plan_builder_storage.go | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkg/deployment/reconcile/plan_builder_storage.go b/pkg/deployment/reconcile/plan_builder_storage.go
index ef936e15e..7e454e42f 100644
--- a/pkg/deployment/reconcile/plan_builder_storage.go
+++ b/pkg/deployment/reconcile/plan_builder_storage.go
@@ -141,23 +141,14 @@ func pvcResizePlan(log zerolog.Logger, group api.ServerGroup, groupSpec api.Serv
 			api.NewAction(api.ActionTypePVCResize, group, memberID),
 		}
 	case api.PVCResizeModeRotate:
-		var plan api.Plan
-
-		if group == api.ServerGroupDBServers {
-			plan = append(plan,
-				api.NewAction(api.ActionTypeCleanOutMember, group, memberID),
-			)
-		}
-
-		plan = append(plan,
+		return api.Plan{
+			api.NewAction(api.ActionTypeResignLeadership, group, memberID),
 			api.NewAction(api.ActionTypeRotateStartMember, group, memberID),
 			api.NewAction(api.ActionTypePVCResize, group, memberID),
 			api.NewAction(api.ActionTypePVCResized, group, memberID),
 			api.NewAction(api.ActionTypeRotateStopMember, group, memberID),
 			api.NewAction(api.ActionTypeWaitForMemberUp, group, memberID),
-		)
-
-		return plan
+		}
 	default:
 		log.Error().Str("server-group", group.AsRole()).Str("mode", mode.String()).
 			Msg("Requested mode is not supported")

From 60c8ad8906601959559e31c2f4cbacc03af79549 Mon Sep 17 00:00:00 2001
From: ajanikow <12255597+ajanikow@users.noreply.github.com>
Date: Fri, 19 Feb 2021 21:46:52 +0000
Subject: [PATCH 2/2] CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2babeade2..dec8d9960 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Use cached status in member client creation
 - Remove failed DBServers
 - Remove deadlock in internal cache
+- Replace CleanOut action with ResignLeadership on rotate PVC resize mode
 
 ## [1.1.4](https://github.com/arangodb/kube-arangodb/tree/1.1.4) (2021-02-15)
 - Add support for spec.ClusterDomain to be able to use FQDN in ArangoDB cluster communication