Merge pull request kubernetes-sigs#41 from lreciomelero/fix/resetting…

…_retain_functionality [EOS-10953] fixed --retain bug
stg-0 · Feb 14, 2023 · 28672aa · 28672aa
2 parents 91f831c + 16aa97a
commit 28672aa
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/cluster/createoption.go b/pkg/cluster/createoption.go
@@ -81,11 +81,17 @@ func CreateWithRetain(retain bool) CreateOption {
 }
 
 func CreateWithMove(move bool) CreateOption {
-	return CreateWithRetain(move)
+	return createOptionAdapter(func(o *internalcreate.ClusterOptions) error {
+		o.Retain = move || o.Retain
+		return nil
+	})
 }
 
 func CreateWithAvoidCreation(avoidCreation bool) CreateOption {
-	return CreateWithRetain(avoidCreation)
+	return createOptionAdapter(func(o *internalcreate.ClusterOptions) error {
+		o.Retain = avoidCreation || o.Retain
+		return nil
+	})
 }
 
 // CreateWithWaitForReady configures a maximum wait time for the control plane