Skip to content

Commit 858bd56

Browse files
authored
Bump Ceph to current version and get working (rackerlabs#112)
* bump rook-ceph to v1.13.5 * bump rook-ceph to c62fc2f8777d2d25a913cbf26e1af8a92f8ecb53 * add new service account for rook-ceph * update rook-operator configs * revert monitoring enabled in rook-cluster, clobbers cluster creation
1 parent ab27277 commit 858bd56

File tree

5 files changed

+641
-2053
lines changed

5 files changed

+641
-2053
lines changed

kustomize/rook-cluster/rook-cluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
# enable prometheus alerting for cluster
7878
monitoring:
7979
# requires Prometheus to be pre-installed
80-
enabled: true
80+
enabled: false
8181
# Whether to disable the metrics reported by Ceph. If false, the prometheus mgr module and Ceph exporter are enabled.
8282
# If true, the prometheus mgr module and Ceph exporter are both disabled. Default is false.
8383
metricsDisabled: false

kustomize/rook-operator/common.yaml

+37-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rules:
3333
verbs: ["get", "list", "watch"]
3434
- apiGroups: [""]
3535
resources: ["persistentvolumes"]
36-
verbs: ["get", "list", "watch", "create", "delete", "patch"]
36+
verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
3737
- apiGroups: [""]
3838
resources: ["persistentvolumeclaims"]
3939
verbs: ["get", "list", "watch", "patch", "update"]
@@ -54,16 +54,25 @@ rules:
5454
verbs: ["patch"]
5555
- apiGroups: ["snapshot.storage.k8s.io"]
5656
resources: ["volumesnapshots"]
57-
verbs: ["get", "list"]
57+
verbs: ["get", "list", "watch", "update", "patch", "create"]
5858
- apiGroups: ["snapshot.storage.k8s.io"]
5959
resources: ["volumesnapshotclasses"]
6060
verbs: ["get", "list", "watch"]
6161
- apiGroups: ["snapshot.storage.k8s.io"]
6262
resources: ["volumesnapshotcontents"]
63-
verbs: ["get", "list", "watch", "patch", "update"]
63+
verbs: ["get", "list", "watch", "patch", "update", "create"]
6464
- apiGroups: ["snapshot.storage.k8s.io"]
6565
resources: ["volumesnapshotcontents/status"]
6666
verbs: ["update", "patch"]
67+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
68+
resources: ["volumegroupsnapshotclasses"]
69+
verbs: ["get", "list", "watch"]
70+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
71+
resources: ["volumegroupsnapshotcontents"]
72+
verbs: ["get", "list", "watch", "update", "patch"]
73+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
74+
resources: ["volumegroupsnapshotcontents/status"]
75+
verbs: ["update", "patch"]
6776
---
6877
kind: ClusterRole
6978
apiVersion: rbac.authorization.k8s.io/v1
@@ -125,7 +134,7 @@ rules:
125134
verbs: ["get", "list", "watch"]
126135
- apiGroups: [""]
127136
resources: ["persistentvolumes"]
128-
verbs: ["get", "list", "watch", "create", "delete", "patch"]
137+
verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
129138
- apiGroups: [""]
130139
resources: ["persistentvolumeclaims"]
131140
verbs: ["get", "list", "watch", "update"]
@@ -152,16 +161,25 @@ rules:
152161
verbs: ["patch"]
153162
- apiGroups: ["snapshot.storage.k8s.io"]
154163
resources: ["volumesnapshots"]
155-
verbs: ["get", "list", "watch"]
164+
verbs: ["get", "list", "watch", "update", "patch", "create"]
156165
- apiGroups: ["snapshot.storage.k8s.io"]
157166
resources: ["volumesnapshotclasses"]
158167
verbs: ["get", "list", "watch"]
159168
- apiGroups: ["snapshot.storage.k8s.io"]
160169
resources: ["volumesnapshotcontents"]
161-
verbs: ["get", "list", "watch", "patch", "update"]
170+
verbs: ["get", "list", "watch", "patch", "update", "create"]
162171
- apiGroups: ["snapshot.storage.k8s.io"]
163172
resources: ["volumesnapshotcontents/status"]
164173
verbs: ["update", "patch"]
174+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
175+
resources: ["volumegroupsnapshotclasses"]
176+
verbs: ["get", "list", "watch"]
177+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
178+
resources: ["volumegroupsnapshotcontents"]
179+
verbs: ["get", "list", "watch", "update", "patch"]
180+
- apiGroups: ["groupsnapshot.storage.k8s.io"]
181+
resources: ["volumegroupsnapshotcontents/status"]
182+
verbs: ["update", "patch"]
165183
- apiGroups: [""]
166184
resources: ["configmaps"]
167185
verbs: ["get"]
@@ -563,7 +581,7 @@ rules:
563581
verbs: ["create"]
564582
- apiGroups: ["csiaddons.openshift.io"]
565583
resources: ["networkfences"]
566-
verbs: ["create", "get", "update", "delete", "watch", "list"]
584+
verbs: ["create", "get", "update", "delete", "watch", "list", "deletecollection"]
567585
- apiGroups: ["apiextensions.k8s.io"]
568586
resources: ["customresourcedefinitions"]
569587
verbs: ["get"]
@@ -1154,6 +1172,18 @@ metadata:
11541172
# imagePullSecrets:
11551173
# - name: my-registry-secret
11561174
---
1175+
# Service account for other components
1176+
apiVersion: v1
1177+
kind: ServiceAccount
1178+
metadata:
1179+
name: rook-ceph-default
1180+
namespace: rook-ceph # namespace:cluster
1181+
labels:
1182+
operator: rook
1183+
storage-backend: ceph
1184+
# imagePullSecrets:
1185+
# - name: my-registry-secret
1186+
---
11571187
# Service account for Ceph mgrs
11581188
apiVersion: v1
11591189
kind: ServiceAccount

0 commit comments

Comments
 (0)