feat: Bump rook-ceph to 1.11.2 (#1115)

* chore: Update rook-ceph 1.10.11 => 1.11.2 * chore: Move rook-ceph/1.10.11 => rook-ceph/1.11.2 * chore: Update rook-ceph-cluster 1.10.11 => 1.11.2 * chore: Move rook-ceph-cluster/1.10.11 => rook-ceph-cluster/1.11.2 * fix: Bump missing ceph version in pre-install * feat: Bump ceph in licenses * fix: Remove deprecated healthCheck spec * feat: Remove pspEnable as it is now defaulted to false --------- Co-authored-by: d2iq-mergebot <[email protected]> Co-authored-by: Grace Do <[email protected]>
mesosphere · Apr 5, 2023 · 559db59 · 559db59
1 parent d761d6a
commit 559db59
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 23 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -163,7 +163,7 @@ resources:
         ref: ${image_tag}
         license_path: LICENSE
         notice_path: NOTICE
-  - container_image: docker.io/rook/ceph:v1.10.11
+  - container_image: docker.io/rook/ceph:v1.11.2
     sources:
       - url: https://github.com/rook/rook
         ref: ${image_tag}

diff --git a/...ook-ceph-cluster/1.10.11/defaults/cm.yaml → ...rook-ceph-cluster/1.11.2/defaults/cm.yaml b/...ook-ceph-cluster/1.10.11/defaults/cm.yaml → ...rook-ceph-cluster/1.11.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-cluster-1.10.11-d2iq-defaults
+  name: rook-ceph-cluster-1.11.2-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -14,10 +14,6 @@ data:
       # This is enabled by default to workaround D2IQ-96634
       enabled: true
 
-    # PSP is Unsupported in 1.25+ k8s
-    # Set this to the same value as the rook-ceph chart.
-    pspEnable: false
-
     # All values below are taken from the CephCluster CRD
     cephClusterSpec:
       labels:
@@ -166,9 +162,6 @@ data:
               requests:
                 cpu: "250m"
                 memory: "500Mi"
-          healthCheck:
-            bucket:
-              interval: 60s
         storageClass:
           enabled: true
           name: dkp-object-store # Defined once per namespace

diff --git a/...uster/1.10.11/defaults/kustomization.yaml → ...luster/1.11.2/defaults/kustomization.yaml b/...uster/1.10.11/defaults/kustomization.yaml → ...luster/1.11.2/defaults/kustomization.yaml
diff --git a/....11/grafana-dashboards/kustomization.yaml → ...1.2/grafana-dashboards/kustomization.yaml b/....11/grafana-dashboards/kustomization.yaml → ...1.2/grafana-dashboards/kustomization.yaml
diff --git a/...grafana-dashboards/rook-ceph-cluster.json → ...grafana-dashboards/rook-ceph-cluster.json b/...grafana-dashboards/rook-ceph-cluster.json → ...grafana-dashboards/rook-ceph-cluster.json
diff --git a/....11/grafana-dashboards/rook-ceph-osd.json → ...1.2/grafana-dashboards/rook-ceph-osd.json b/....11/grafana-dashboards/rook-ceph-osd.json → ...1.2/grafana-dashboards/rook-ceph-osd.json
diff --git a/...1/grafana-dashboards/rook-ceph-pools.json → ...2/grafana-dashboards/rook-ceph-pools.json b/...1/grafana-dashboards/rook-ceph-pools.json → ...2/grafana-dashboards/rook-ceph-pools.json
diff --git a/...ter/1.10.11/helmrelease/dashboard-cm.yaml → ...ster/1.11.2/helmrelease/dashboard-cm.yaml b/...ter/1.10.11/helmrelease/dashboard-cm.yaml → ...ster/1.11.2/helmrelease/dashboard-cm.yaml
diff --git a/...ster/1.10.11/helmrelease/helmrelease.yaml → ...uster/1.11.2/helmrelease/helmrelease.yaml b/...ster/1.10.11/helmrelease/helmrelease.yaml → ...uster/1.11.2/helmrelease/helmrelease.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: charts.rook.io-release
         namespace: kommander-flux
-      version: v1.10.11
+      version: v1.11.2
   interval: 15s
   install:
     crds: CreateReplace
@@ -25,5 +25,5 @@ spec:
   releaseName: rook-ceph-cluster
   valuesFrom:
     - kind: ConfigMap
-      name: rook-ceph-cluster-1.10.11-d2iq-defaults
+      name: rook-ceph-cluster-1.11.2-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/...er/1.10.11/helmrelease/kustomization.yaml → ...ter/1.11.2/helmrelease/kustomization.yaml b/...er/1.10.11/helmrelease/kustomization.yaml → ...ter/1.11.2/helmrelease/kustomization.yaml
diff --git a/...k-ceph-cluster/1.10.11/kustomization.yaml → ...ok-ceph-cluster/1.11.2/kustomization.yaml b/...k-ceph-cluster/1.10.11/kustomization.yaml → ...ok-ceph-cluster/1.11.2/kustomization.yaml
diff --git a/...cluster/1.10.11/object-bucket-claims.yaml → ...-cluster/1.11.2/object-bucket-claims.yaml b/...cluster/1.10.11/object-bucket-claims.yaml → ...-cluster/1.11.2/object-bucket-claims.yaml
@@ -13,7 +13,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.10.11/objectbucketclaims
+  path: ./services/rook-ceph-cluster/1.11.2/objectbucketclaims
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/...10.11/objectbucketclaims/helmrelease.yaml → ....11.2/objectbucketclaims/helmrelease.yaml b/...10.11/objectbucketclaims/helmrelease.yaml → ....11.2/objectbucketclaims/helmrelease.yaml
@@ -26,7 +26,7 @@ spec:
   releaseName: object-bucket-claims
   valuesFrom:
     - kind: ConfigMap
-      name: rook-ceph-cluster-1.10.11-d2iq-defaults
+      name: rook-ceph-cluster-1.11.2-d2iq-defaults
     - kind: ConfigMap
       name: rook-ceph-cluster-overrides
       optional: true

diff --git a/....11/objectbucketclaims/kustomization.yaml → ...1.2/objectbucketclaims/kustomization.yaml b/....11/objectbucketclaims/kustomization.yaml → ...1.2/objectbucketclaims/kustomization.yaml
diff --git a/...ook-ceph-cluster/1.10.11/pre-install.yaml → ...rook-ceph-cluster/1.11.2/pre-install.yaml b/...ook-ceph-cluster/1.10.11/pre-install.yaml → ...rook-ceph-cluster/1.11.2/pre-install.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.10.11/pre-install
+  path: ./services/rook-ceph-cluster/1.11.2/pre-install
   sourceRef:
     kind: GitRepository
     name: management
@@ -19,4 +19,4 @@ spec:
     substitute:
       releaseNamespace: ${releaseNamespace}
       # Update the following version whenever ceph-cluster service is bumped.
-      desiredCephOperatorVersion: v1.10.11
+      desiredCephOperatorVersion: v1.11.2
diff --git a/...r/1.10.11/pre-install/ceph-crd-check.yaml → ...er/1.11.2/pre-install/ceph-crd-check.yaml b/...r/1.10.11/pre-install/ceph-crd-check.yaml → ...er/1.11.2/pre-install/ceph-crd-check.yaml
diff --git a/...ph-cluster/1.10.11/rook-ceph-cluster.yaml → ...eph-cluster/1.11.2/rook-ceph-cluster.yaml b/...ph-cluster/1.10.11/rook-ceph-cluster.yaml → ...eph-cluster/1.11.2/rook-ceph-cluster.yaml
@@ -13,7 +13,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.10.11/helmrelease
+  path: ./services/rook-ceph-cluster/1.11.2/helmrelease
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/services/rook-ceph/1.10.11/defaults/cm.yaml → services/rook-ceph/1.11.2/defaults/cm.yaml b/services/rook-ceph/1.10.11/defaults/cm.yaml → services/rook-ceph/1.11.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-1.10.11-d2iq-defaults
+  name: rook-ceph-1.11.2-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -23,9 +23,6 @@ data:
     # Whether rook watches its current namespace for CRDs or the entire cluster, defaults to false
     currentNamespaceOnly: true
 
-    # PSP is Unsupported in 1.25+ k8s
-    pspEnable: false
-
     logLevel: DEBUG
 
     csi:

diff --git a/...-ceph/1.10.11/defaults/kustomization.yaml → ...k-ceph/1.11.2/defaults/kustomization.yaml b/...-ceph/1.10.11/defaults/kustomization.yaml → ...k-ceph/1.11.2/defaults/kustomization.yaml
diff --git a/...ceph/1.10.11/helmrelease/helmrelease.yaml → ...-ceph/1.11.2/helmrelease/helmrelease.yaml b/...ceph/1.10.11/helmrelease/helmrelease.yaml → ...-ceph/1.11.2/helmrelease/helmrelease.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: charts.rook.io-release
         namespace: kommander-flux
-      version: v1.10.11
+      version: v1.11.2
   interval: 15s
   install:
     crds: CreateReplace
@@ -25,5 +25,5 @@ spec:
   releaseName: rook-ceph
   valuesFrom:
     - kind: ConfigMap
-      name: rook-ceph-1.10.11-d2iq-defaults
+      name: rook-ceph-1.11.2-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/...ph/1.10.11/helmrelease/kustomization.yaml → ...eph/1.11.2/helmrelease/kustomization.yaml b/...ph/1.10.11/helmrelease/kustomization.yaml → ...eph/1.11.2/helmrelease/kustomization.yaml
diff --git a/...ices/rook-ceph/1.10.11/kustomization.yaml → services/rook-ceph/1.11.2/kustomization.yaml b/...ices/rook-ceph/1.10.11/kustomization.yaml → services/rook-ceph/1.11.2/kustomization.yaml
diff --git a/services/rook-ceph/1.10.11/rook-ceph.yaml → services/rook-ceph/1.11.2/rook-ceph.yaml b/services/rook-ceph/1.10.11/rook-ceph.yaml → services/rook-ceph/1.11.2/rook-ceph.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph/1.10.11/helmrelease
+  path: ./services/rook-ceph/1.11.2/helmrelease
   sourceRef:
     kind: GitRepository
     name: management