From 9c4f1620a14d840132e6b90c8786dc671fe713bc Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Fri, 8 May 2020 06:57:01 +0000 Subject: [PATCH] [BUGFIX] Do not remove not know pvcs --- CHANGELOG.md | 3 ++- pkg/deployment/resources/pvc_inspector.go | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52d4c96e..cc5d586ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Change Log ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A) +- Prevent deletion not known PVC's -## [1.0.1](https://github.com/arangodb/kube-arangodb/tree/1.0.1) (2020-04-16) +## [1.0.2](https://github.com/arangodb/kube-arangodb/tree/1.0.2) (2020-04-16) - Added additional checks in UpToDate condition - Added extended Rotation check for Cluster mode - Removed old rotation logic (rotation of ArangoDeployment may be enforced after Operator upgrade) diff --git a/pkg/deployment/resources/pvc_inspector.go b/pkg/deployment/resources/pvc_inspector.go index 0e2e84c69..d62b8a295 100644 --- a/pkg/deployment/resources/pvc_inspector.go +++ b/pkg/deployment/resources/pvc_inspector.go @@ -65,17 +65,6 @@ func (r *Resources) InspectPVCs(ctx context.Context) (util.Interval, error) { memberStatus, group, found := status.Members.MemberStatusByPVCName(p.GetName()) if !found { log.Debug().Str("pvc", p.GetName()).Msg("no memberstatus found for PVC") - if k8sutil.IsPersistentVolumeClaimMarkedForDeletion(&p) && len(p.GetFinalizers()) > 0 { - // Strange, pvc belongs to us, but we have no member for it. - // Remove all finalizers, so it can be removed. - log.Warn().Msg("PVC belongs to this deployment, but we don't know the member. Removing all finalizers") - kubecli := r.context.GetKubeCli() - ignoreNotFound := false - if err := k8sutil.RemovePVCFinalizers(log, kubecli, &p, p.GetFinalizers(), ignoreNotFound); err != nil { - log.Debug().Err(err).Msg("Failed to update PVC (to remove all finalizers)") - return 0, maskAny(err) - } - } continue }