rook: update rook to 1.4.6

assets/charts/components/rook/Chart.yaml

@@ -4,4 +4,4 @@ icon: https://rook.io/images/rook-logo.svg
 name: rook-ceph
 sources:
 - https://github.com/rook/rook
-version: v1.4.2
+version: v1.4.6

assets/charts/components/rook/templates/role.yaml

@@ -43,6 +43,18 @@ rules:
   - network-attachment-definitions
   verbs:
   - get
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  - prometheusrules
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - delete
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1beta1

assets/charts/components/rook/values.yaml

@@ -5,7 +5,7 @@
 image:
   prefix: rook
   repository: rook/ceph
-  tag: v1.4.2
+  tag: v1.4.6
   pullPolicy: IfNotPresent
 
 resources:
@@ -239,7 +239,7 @@ csi:
   #rbdLivenessMetricsPort: 9080
   #kubeletDirPath: /var/lib/kubelet
   #cephcsi:
-    #image: quay.io/cephcsi/cephcsi:v3.1.0
+    #image: quay.io/cephcsi/cephcsi:v3.1.1
   #registrar:
     #image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
   #provisioner:

pkg/components/rook-ceph/manifests.go

@@ -15,7 +15,7 @@
 package rookceph
 
 // CephCluster resource definition was taken from:
-// https://github.com/rook/rook/blob/v1.4.2/cluster/examples/kubernetes/ceph/cluster.yaml
+// https://github.com/rook/rook/blob/v1.4.6/cluster/examples/kubernetes/ceph/cluster.yaml
 var template = map[string]string{
 	"ceph-cluster.yaml": `
 apiVersion: ceph.rook.io/v1
@@ -25,7 +25,7 @@ metadata:
   namespace: {{ .Namespace }}
 spec:
   cephVersion:
-    image: ceph/ceph:v15.2.4-20200630
+    image: ceph/ceph:v15.2.5-20200916
     allowUnsupported: false
   dataDirHostPath: /var/lib/rook
   skipUpgradeChecks: false
@@ -52,6 +52,7 @@ spec:
       method: quick
       dataSource: zero
       iteration: 1
+    allowUninstallWithVolumes: false
   placement:
     all:
       {{- if .NodeAffinity }}
@@ -186,7 +187,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: rook-ceph-tools
-        image: rook/ceph:v1.4.2
+        image: rook/ceph:v1.4.6
         command: ["/tini"]
         args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
         imagePullPolicy: IfNotPresent