From fa834d9a20709e7ca420e2f53cac513f9012d672 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 24 Oct 2019 14:24:45 -0600 Subject: [PATCH] nfs: set correct owner reference name for garbage collection The owner reference for the NFS custom resource was using the namespace instead of the name. This causes the k8s garbage collector to remove the nfs resources in some scenarios such as restarting etcd. Signed-off-by: Travis Nielsen --- pkg/operator/nfs/controller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/operator/nfs/controller.go b/pkg/operator/nfs/controller.go index 101481744..6c7fc301b 100644 --- a/pkg/operator/nfs/controller.go +++ b/pkg/operator/nfs/controller.go @@ -101,16 +101,16 @@ func newNfsServer(c *nfsv1alpha1.NFSServer, context *clusterd.Context) *nfsServe context: context, namespace: c.Namespace, spec: c.Spec, - ownerRef: nfsOwnerRef(c.Namespace, string(c.UID)), + ownerRef: nfsOwnerRef(c.Name, string(c.UID)), } } -func nfsOwnerRef(namespace, nfsServerID string) metav1.OwnerReference { +func nfsOwnerRef(name, nfsServerID string) metav1.OwnerReference { blockOwner := true return metav1.OwnerReference{ APIVersion: fmt.Sprintf("%s/%s", NFSResource.Group, NFSResource.Version), Kind: NFSResource.Kind, - Name: namespace, + Name: name, UID: types.UID(nfsServerID), BlockOwnerDeletion: &blockOwner, }