Merge pull request #119 from projectsyn/deps/rook-1.10.13

Update to Rook v1.10.13
projectsyn · Apr 20, 2023 · abeb8f6 · abeb8f6
2 parents 690f0e1 + 8e1c5a2
commit abeb8f6
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 42 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -155,7 +155,7 @@ parameters:
       rook:
         registry: docker.io
         image: rook/ceph
-        tag: v1.10.11
+        tag: v1.10.13
       ceph:
         registry: quay.io
         image: ceph/ceph
@@ -171,7 +171,7 @@ parameters:
 
     charts:
       # We do not support helm chart versions older than v1.7.0
-      rook-ceph: v1.10.11
+      rook-ceph: v1.10.13
 
     operator_helm_values:
       image:

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -55,6 +55,9 @@ local common_labels(name) = {
 
 // This is required for Rook 1.10.0-1.10.11, cf.
 // https://github.com/rook/rook/pull/11697
+// NOTE(sg): We keep the workaround for now even though we default to Rook
+// 1.10.13 which fixes the permissions, to allow users to stay on lower 1.10
+// versions for the moment.
 local cephfs_rbac_fix =
   local cephfs_additional_role =
     kube.ClusterRole('syn-rook-ceph-cephfs-provisioner-fix') {

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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-rgw

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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system
@@ -41,7 +41,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-cluster-mgmt
@@ -74,7 +74,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global
@@ -254,7 +254,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-mgr-cluster
@@ -310,7 +310,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-object-bucket
@@ -403,6 +403,14 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - ''
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
+      - watch
   - apiGroups:
       - ''
     resources:
@@ -503,7 +511,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rbd-csi-nodeplugin
@@ -700,7 +708,7 @@ rules:
     verbs:
       - get
       - list
-      - watch"
+      - watch
   - apiGroups:
       - storage.k8s.io
     resources:

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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global

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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+        helm.sh/chart: rook-ceph-v1.10.13
     spec:
       containers:
         - args:
@@ -49,7 +49,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: docker.io/rook/ceph:v1.10.11
+          image: docker.io/rook/ceph:v1.10.13
           imagePullPolicy: IfNotPresent
           name: rook-ceph-operator
           ports:

diff --git a/.../golden/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/role.yaml b/.../golden/defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/role.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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system

diff --git a/.../defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/rolebinding.yaml b/.../defaults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/rolebinding.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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system

diff --git a/...faults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/serviceaccount.yaml b/...faults/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/serviceaccount.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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system

diff --git a/tests/golden/defaults/rook-ceph/rook-ceph/10_cephcluster_toolbox.yaml b/tests/golden/defaults/rook-ceph/rook-ceph/10_cephcluster_toolbox.yaml
@@ -109,7 +109,7 @@ spec:
                 secretKeyRef:
                   key: ceph-username
                   name: rook-ceph-mon
-          image: docker.io/rook/ceph:v1.10.11
+          image: docker.io/rook/ceph:v1.10.13
           imagePullPolicy: IfNotPresent
           name: rook-ceph-tools
           securityContext:

diff --git a/...enshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/cluster-rbac.yaml b/...enshift4/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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-rgw

diff --git a/...penshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrole.yaml b/...penshift4/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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system
@@ -41,7 +41,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-cluster-mgmt
@@ -74,7 +74,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global
@@ -254,7 +254,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-mgr-cluster
@@ -310,7 +310,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-object-bucket
@@ -403,6 +403,14 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - ''
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
+      - watch
   - apiGroups:
       - ''
     resources:
@@ -503,7 +511,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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rbd-csi-nodeplugin
@@ -700,7 +708,7 @@ rules:
     verbs:
       - get
       - list
-      - watch"
+      - watch
   - apiGroups:
       - storage.k8s.io
     resources:

diff --git a/...t4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/clusterrolebinding.yaml b/...t4/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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-global

diff --git a/...openshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/deployment.yaml b/...openshift4/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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     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.11
+        helm.sh/chart: rook-ceph-v1.10.13
     spec:
       containers:
         - args:
@@ -49,7 +49,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: docker.io/rook/ceph:v1.10.11
+          image: docker.io/rook/ceph:v1.10.13
           imagePullPolicy: IfNotPresent
           name: rook-ceph-operator
           ports:

diff --git a/...olden/openshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/role.yaml b/...olden/openshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/role.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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system

diff --git a/...penshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/rolebinding.yaml b/...penshift4/rook-ceph/rook-ceph/01_rook_ceph_helmchart/rook-ceph/templates/rolebinding.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.11
+    helm.sh/chart: rook-ceph-v1.10.13
     operator: rook
     storage-backend: ceph
   name: rook-ceph-system