Update dependency Rook to v1.12.7

Signed-off-by: Renovate Bot <[email protected]>
projectsyn · Oct 27, 2023 · 7f857ae · 7f857ae
1 parent a20e483
commit 7f857ae
Show file tree

Hide file tree

Showing 26 changed files with 18,283 additions and 22,611 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -225,7 +225,7 @@ parameters:
       rook:
         registry: docker.io
         image: rook/ceph
-        tag: v1.10.13
+        tag: v1.12.7
       ceph:
         registry: quay.io
         image: ceph/ceph
@@ -241,7 +241,7 @@ parameters:
 
     charts:
       # We do not support helm chart versions older than v1.7.0
-      rook-ceph: v1.10.13
+      rook-ceph: v1.12.7
 
     operator_helm_values:
       image:

diff --git a/...defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/cluster-rbac.yaml b/...defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/cluster-rbac.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-osd
@@ -18,7 +18,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-mgr
@@ -31,7 +31,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-cmd-reporter
@@ -50,7 +50,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-rgw
@@ -94,6 +94,7 @@ rules:
       - secrets
     verbs:
       - get
+      - update
   - apiGroups:
       - ''
     resources:
@@ -179,6 +180,7 @@ rules:
       - cephfilesystemmirrors
       - cephfilesystemsubvolumegroups
       - cephblockpoolradosnamespaces
+      - cephcosidrivers
     verbs:
       - get
       - list

diff --git a/.../defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrole.yaml b/.../defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system
@@ -33,6 +33,23 @@ rules:
       - get
       - delete
       - update
+  - apiGroups:
+      - csiaddons.openshift.io
+    resources:
+      - networkfences
+    verbs:
+      - create
+      - get
+      - update
+      - delete
+      - watch
+      - list
+  - apiGroups:
+      - apiextensions.k8s.io
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -41,7 +58,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-cluster-mgmt
@@ -74,7 +91,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global
@@ -127,6 +144,7 @@ rules:
       - create
       - update
       - delete
+      - deletecollection
   - apiGroups:
       - ceph.rook.io
     resources:
@@ -146,6 +164,7 @@ rules:
       - cephfilesystemmirrors
       - cephfilesystemsubvolumegroups
       - cephblockpoolradosnamespaces
+      - cephcosidrivers
     verbs:
       - get
       - list
@@ -209,6 +228,12 @@ rules:
       - update
       - delete
       - deletecollection
+  - apiGroups:
+      - apps
+    resources:
+      - deployments/finalizers
+    verbs:
+      - update
   - apiGroups:
       - healthchecking.openshift.io
     resources:
@@ -254,7 +279,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-mgr-cluster
@@ -310,7 +335,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-object-bucket
@@ -511,7 +536,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rbd-csi-nodeplugin
@@ -717,3 +742,52 @@ rules:
       - get
       - list
       - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: driver-ceph
+    app.kubernetes.io/name: cosi-driver-ceph
+    app.kubernetes.io/part-of: container-object-storage-interface
+  name: objectstorage-provisioner-role
+rules:
+  - apiGroups:
+      - objectstorage.k8s.io
+    resources:
+      - buckets
+      - bucketaccesses
+      - bucketclaims
+      - bucketaccessclasses
+      - buckets/status
+      - bucketaccesses/status
+      - bucketclaims/status
+      - bucketaccessclasses/status
+    verbs:
+      - get
+      - list
+      - watch
+      - update
+      - create
+      - delete
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - get
+      - watch
+      - list
+      - delete
+      - update
+      - create
+  - apiGroups:
+      - ''
+    resources:
+      - secrets
+      - events
+    verbs:
+      - get
+      - delete
+      - update
+      - create
diff --git a/...ts/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrolebinding.yaml b/...ts/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system
@@ -25,7 +25,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global
@@ -79,6 +79,19 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
+metadata:
+  name: cephfs-csi-nodeplugin-role
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cephfs-csi-nodeplugin
+subjects:
+  - kind: ServiceAccount
+    name: rook-csi-cephfs-plugin-sa
+    namespace: syn-rook-ceph-operator
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
   name: rbd-csi-provisioner-role
 roleRef:
@@ -89,3 +102,20 @@ subjects:
   - kind: ServiceAccount
     name: rook-csi-rbd-provisioner-sa
     namespace: syn-rook-ceph-operator
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: driver-ceph
+    app.kubernetes.io/name: cosi-driver-ceph
+    app.kubernetes.io/part-of: container-object-storage-interface
+  name: objectstorage-provisioner-role-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: objectstorage-provisioner-role
+subjects:
+  - kind: ServiceAccount
+    name: objectstorage-provisioner
+    namespace: syn-rook-ceph-operator
diff --git a/...en/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/configmap.yaml b/...en/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/configmap.yaml
@@ -1,5 +1,6 @@
 apiVersion: v1
 data:
+  CSI_CEPHFS_ATTACH_REQUIRED: 'true'
   CSI_CEPHFS_FSGROUPPOLICY: File
   CSI_CEPHFS_PLUGIN_RESOURCE: |
     - name : driver-registrar
@@ -84,9 +85,11 @@ data:
   CSI_ENABLE_NFS_SNAPSHOTTER: 'true'
   CSI_ENABLE_OMAP_GENERATOR: 'false'
   CSI_ENABLE_RBD_SNAPSHOTTER: 'true'
+  CSI_ENABLE_READ_AFFINITY: 'false'
   CSI_ENABLE_TOPOLOGY: 'false'
   CSI_FORCE_CEPHFS_KERNEL_CLIENT: 'true'
   CSI_GRPC_TIMEOUT_SECONDS: '150'
+  CSI_NFS_ATTACH_REQUIRED: 'true'
   CSI_NFS_FSGROUPPOLICY: File
   CSI_NFS_PLUGIN_RESOURCE: |
     - name : driver-registrar
@@ -122,13 +125,22 @@ data:
         limits:
           memory: 1Gi
           cpu: 500m
+    - name : csi-attacher
+      resource:
+        requests:
+          memory: 512Mi
+          cpu: 250m
+        limits:
+          memory: 1Gi
+          cpu: 500m
   CSI_PLUGIN_ENABLE_SELINUX_HOST_MOUNT: 'false'
   CSI_PLUGIN_PRIORITY_CLASSNAME: system-node-critical
   CSI_PROVISIONER_PRIORITY_CLASSNAME: system-cluster-critical
   CSI_PROVISIONER_REPLICAS: '2'
   CSI_PROVISIONER_TOLERATIONS: |-
     - key: storagenode
       operator: Exists
+  CSI_RBD_ATTACH_REQUIRED: 'true'
   CSI_RBD_FSGROUPPOLICY: File
   CSI_RBD_PLUGIN_RESOURCE: |
     - name : driver-registrar
@@ -214,14 +226,15 @@ data:
           cpu: 100m
   ROOK_CEPH_ALLOW_LOOP_DEVICES: 'false'
   ROOK_CEPH_COMMANDS_TIMEOUT_SECONDS: '15'
-  ROOK_CSIADDONS_IMAGE: quay.io/csiaddons/k8s-sidecar:v0.5.0
+  ROOK_CSIADDONS_IMAGE: quay.io/csiaddons/k8s-sidecar:v0.7.0
   ROOK_CSI_CEPH_IMAGE: quay.io/cephcsi/cephcsi:v3.7.2
   ROOK_CSI_ENABLE_CEPHFS: 'false'
   ROOK_CSI_ENABLE_GRPC_METRICS: 'true'
   ROOK_CSI_ENABLE_NFS: 'false'
   ROOK_CSI_ENABLE_RBD: 'true'
   ROOK_CSI_IMAGE_PULL_POLICY: IfNotPresent
   ROOK_DISABLE_ADMISSION_CONTROLLER: 'true'
+  ROOK_ENABLE_DISCOVERY_DAEMON: 'false'
   ROOK_LOG_LEVEL: INFO
   ROOK_OBC_WATCH_OPERATOR_NAMESPACE: 'true'
 kind: ConfigMap

diff --git a/...n/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/deployment.yaml b/...n/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/created-by: helm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: rook-ceph-operator
-    helm.sh/chart: rook-ceph-v1.10.13
+    helm.sh/chart: rook-ceph-v1.12.7
     operator: rook
     storage-backend: ceph
   name: rook-ceph-operator
@@ -20,7 +20,7 @@ spec:
     metadata:
       labels:
         app: rook-ceph-operator
-        helm.sh/chart: rook-ceph-v1.10.13
+        helm.sh/chart: rook-ceph-v1.12.7
     spec:
       containers:
         - args:
@@ -33,10 +33,8 @@ spec:
               value: 'false'
             - name: ROOK_DISABLE_DEVICE_HOTPLUG
               value: 'false'
-            - name: DISCOVER_DAEMON_UDEV_BLACKLIST
-              value: ''
-            - name: ROOK_ENABLE_DISCOVERY_DAEMON
-              value: 'false'
+            - name: ROOK_DISCOVER_DEVICES_INTERVAL
+              value: 60m
             - name: NODE_NAME
               valueFrom:
                 fieldRef:
@@ -49,7 +47,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: docker.io/rook/ceph:v1.10.13
+          image: docker.io/rook/ceph:v1.12.7
           imagePullPolicy: IfNotPresent
           name: rook-ceph-operator
           ports: