Always register finalizer for Repository

stashed · Apr 21, 2018 · 50d0f01 · 50d0f01
1 parent 9da28e1
commit 50d0f01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/pkg/controller/repository.go b/pkg/controller/repository.go
@@ -69,17 +69,14 @@ func (c *StashController) runRepositoryInjector(key string) error {
 					in.ObjectMeta = core_util.RemoveFinalizer(in.ObjectMeta, util.RepositoryFinalizer)
 					return in
 				})
-				if err != nil {
-					return err
-				}
+				return err
 			}
 		} else {
-			if repo.Spec.WipeOut {
-				_, _, err = stash_util.PatchRepository(c.stashClient.StashV1alpha1(), repo, func(in *api.Repository) *api.Repository {
-					in.ObjectMeta = core_util.AddFinalizer(in.ObjectMeta, util.RepositoryFinalizer)
-					return in
-				})
-			}
+			_, _, err = stash_util.PatchRepository(c.stashClient.StashV1alpha1(), repo, func(in *api.Repository) *api.Repository {
+				in.ObjectMeta = core_util.AddFinalizer(in.ObjectMeta, util.RepositoryFinalizer)
+				return in
+			})
+			return err
 		}
 	}
 	return nil

diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go
@@ -44,7 +44,7 @@ const (
 	AppLabelStash      = "stash"
 	OperationScaleDown = "scale-down"
 
-	RepositoryFinalizer            = "wipeOut-repository"
+	RepositoryFinalizer            = "stash"
 	SnapshotIDLength               = 8
 	SnapshotIDLengthWithDashPrefix = 9
 )
@@ -584,9 +584,9 @@ func FixBackendPrefix(backend *api.Backend, autoPrefix string) *api.Backend {
 		backend.B2.Prefix = strings.TrimSuffix(backend.B2.Prefix, autoPrefix)
 		backend.B2.Prefix = strings.TrimSuffix(backend.B2.Prefix, "/")
 	}
-
 	return backend
 }
+
 func GetBucketAndPrefix(backend *api.Backend) (string, string, error) {
 	if backend.S3 != nil {
 		return backend.S3.Bucket, strings.TrimPrefix(backend.S3.Prefix, backend.S3.Bucket+"/"), nil