Skip to content

Commit e8fd704

Browse files
committed
chore(k8s/magiclove/rook-ceph): move ceph csi rbac to rook-ceph namespace
Turns out the service account needs to be in the rook-ceph namespace, and it must have the "-sa" suffix.
1 parent 32a664a commit e8fd704

File tree

14 files changed

+660
-532
lines changed

14 files changed

+660
-532
lines changed

cue.mod/gen/github.com/rook/rook/pkg/apis/ceph.rook.io/v1/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cue_library(
88
"doc_go_gen.cue",
99
"keys_go_gen.cue",
1010
"labels_go_gen.cue",
11+
"namespace_go_gen.cue",
1112
"object_go_gen.cue",
1213
"placement_go_gen.cue",
1314
"register_go_gen.cue",
@@ -22,6 +23,6 @@ cue_library(
2223
"//cue.mod/gen/k8s.io/api/core/v1:cue_v1_library",
2324
"//cue.mod/gen/k8s.io/apimachinery/pkg/api/resource:cue_resource_library",
2425
"//cue.mod/gen/k8s.io/apimachinery/pkg/apis/meta/v1:cue_v1_library",
25-
"//cue.mod/gen/pkg.go.dev/time:cue_time_library",
26+
"//cue.mod/gen/k8s.io/apimachinery/pkg/types:cue_types_library",
2627
],
2728
)

k8s/magiclove/ceph_csi_operator/cluster_role_binding_list.cue

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -35,76 +35,4 @@ import rbacv1 "k8s.io/api/rbac/v1"
3535
name: "ceph-csi-operator-controller-manager"
3636
namespace: #Namespace
3737
}]
38-
}, {
39-
metadata: name: "ceph-csi-operator-cephfs-ctrlplugin"
40-
roleRef: {
41-
apiGroup: "rbac.authorization.k8s.io"
42-
kind: "ClusterRole"
43-
name: "ceph-csi-operator-cephfs-ctrlplugin"
44-
}
45-
subjects: [{
46-
kind: "ServiceAccount"
47-
name: "ceph-csi-operator-cephfs-ctrlplugin"
48-
namespace: #Namespace
49-
}]
50-
}, {
51-
metadata: name: "ceph-csi-operator-cephfs-nodeplugin"
52-
roleRef: {
53-
apiGroup: "rbac.authorization.k8s.io"
54-
kind: "ClusterRole"
55-
name: "ceph-csi-operator-cephfs-nodeplugin"
56-
}
57-
subjects: [{
58-
kind: "ServiceAccount"
59-
name: "ceph-csi-operator-cephfs-nodeplugin"
60-
namespace: #Namespace
61-
}]
62-
}, {
63-
metadata: name: "ceph-csi-operator-nfs-ctrlplugin"
64-
roleRef: {
65-
apiGroup: "rbac.authorization.k8s.io"
66-
kind: "ClusterRole"
67-
name: "ceph-csi-operator-nfs-ctrlplugin"
68-
}
69-
subjects: [{
70-
kind: "ServiceAccount"
71-
name: "ceph-csi-operator-nfs-ctrlplugin"
72-
namespace: #Namespace
73-
}]
74-
}, {
75-
metadata: name: "ceph-csi-operator-nfs-nodeplugin"
76-
roleRef: {
77-
apiGroup: "rbac.authorization.k8s.io"
78-
kind: "ClusterRole"
79-
name: "ceph-csi-operator-nfs-nodeplugin"
80-
}
81-
subjects: [{
82-
kind: "ServiceAccount"
83-
name: "ceph-csi-operator-nfs-nodeplugin"
84-
namespace: #Namespace
85-
}]
86-
}, {
87-
metadata: name: "ceph-csi-operator-rbd-ctrlplugin"
88-
roleRef: {
89-
apiGroup: "rbac.authorization.k8s.io"
90-
kind: "ClusterRole"
91-
name: "ceph-csi-operator-rbd-ctrlplugin"
92-
}
93-
subjects: [{
94-
kind: "ServiceAccount"
95-
name: "ceph-csi-operator-rbd-ctrlplugin"
96-
namespace: #Namespace
97-
}]
98-
}, {
99-
metadata: name: "ceph-csi-operator-rbd-nodeplugin"
100-
roleRef: {
101-
apiGroup: "rbac.authorization.k8s.io"
102-
kind: "ClusterRole"
103-
name: "ceph-csi-operator-rbd-nodeplugin"
104-
}
105-
subjects: [{
106-
kind: "ServiceAccount"
107-
name: "ceph-csi-operator-rbd-nodeplugin"
108-
namespace: #Namespace
109-
}]
11038
}]

0 commit comments

Comments
 (0)