Merge pull request #9006 from BlaineEXE/osd-purge-in-cluster-namespace

docs: move purge osd to cluster namespace
This commit is contained in:
Sébastien Han authored and GitHub committed 2021-10-20 09:52:50 +02:00
commit c512e5f335
2 files changed
+6 -4

No files matched your search

+4 -4
View File
@@ -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
+2
View File
@@ -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 {