From d43327de2ade78c16dc96544b735876faba5377d Mon Sep 17 00:00:00 2001
From: Blaine Gardner <blaine.gardner@redhat.com>
Date: Tue, 19 Oct 2021 12:06:42 -0600
Subject: [PATCH] docs: move purge osd to cluster namespace

The rook-ceph-purge-osd job should be run for a particular CephCluster
and should therefore be namespaced to the cluster.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
---
 cluster/examples/kubernetes/ceph/common.yaml | 8 ++++----
 cmd/rook/ceph/osd.go                         | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml
index 190d966a6..f65ac123a 100644
--- a/cluster/examples/kubernetes/ceph/common.yaml
+++ b/cluster/examples/kubernetes/ceph/common.yaml
@@ -1220,7 +1220,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-purge-osd
-  namespace: rook-ceph # namespace:operator
+  namespace: rook-ceph # namespace:cluster
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -1240,7 +1240,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: rook-ceph-purge-osd
-  namespace: rook-ceph # namespace:operator
+  namespace: rook-ceph # namespace:cluster
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -1248,10 +1248,10 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: rook-ceph-purge-osd
-    namespace: rook-ceph # namespace:operator
+    namespace: rook-ceph # namespace:cluster
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: rook-ceph-purge-osd
-  namespace: rook-ceph # namespace:operator
+  namespace: rook-ceph # namespace:cluster
diff --git a/cmd/rook/ceph/osd.go b/cmd/rook/ceph/osd.go
index f0cbbbc2b..a47a0b4fb 100644
--- a/cmd/rook/ceph/osd.go
+++ b/cmd/rook/ceph/osd.go
@@ -263,6 +263,8 @@ func removeOSDs(cmd *cobra.Command, args []string) error {
 
 	context := createContext()
 
+	clusterInfo.Context = ctx.Background()
+
 	// Run OSD remove sequence
 	err := osddaemon.RemoveOSDs(context, &clusterInfo, strings.Split(osdIDsToRemove, ","), preservePVC)
 	if err != nil {