Skip to content

[BUGFIX] Do not remove not know pvcs #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2020
Merged

[BUGFIX] Do not remove not know pvcs #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c4f162
[BUGFIX] Do not remove not know pvcs
ajanikow May 8, 2020
e69671c
Merge branch 'master' into bugfix/pvc_data_security
ajanikow May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
11 changes: 0 additions & 11 deletions pkg/deployment/resources/pvc_inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down