feat: Bump rook-ceph to v1.15.5 (#2841)

* feat: Bump rook-ceph to v1.15.5 * feat: Bump ceph-ceph to v1.18.2
mesosphere · Nov 22, 2024 · 4b8ca0a · 4b8ca0a
1 parent 1893b8e
commit 4b8ca0a
Show file tree

Hide file tree

Showing 23 changed files with 19 additions and 24 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -247,7 +247,7 @@ resources:
         notice_path: NOTICE
         ref: ${image_tag}
         url: https://github.com/open-policy-agent/gatekeeper
-  - container_image: ghcr.io/mesosphere/dkp-container-images/rook/ceph:v1.14.5
+  - container_image: docker.io/rook/ceph:v1.15.5
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
@@ -383,7 +383,7 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag%-ubuntu22.04}
         url: https://github.com/NVIDIA/dcgm-exporter
-  - container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2
+  - container_image: quay.io/ceph/ceph:v18.2.4
     sources:
       - license_path: COPYING
         ref: ${image_tag}

diff --git a/...rook-ceph-cluster/1.14.5/defaults/cm.yaml → ...rook-ceph-cluster/1.15.5/defaults/cm.yaml b/...rook-ceph-cluster/1.14.5/defaults/cm.yaml → ...rook-ceph-cluster/1.15.5/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-cluster-1.14.5-d2iq-defaults
+  name: rook-ceph-cluster-1.15.5-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -25,7 +25,7 @@ data:
       cephVersion:
         # This image was patched to fix CVEs. To build new version of the image:
         # See: https://github.com/mesosphere/dkp-container-images
-        image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2
+        image: quay.io/ceph/ceph:v18.2.4
 
       resources:
         mgr-sidecar:

diff --git a/...luster/1.14.5/defaults/kustomization.yaml → ...luster/1.15.5/defaults/kustomization.yaml b/...luster/1.14.5/defaults/kustomization.yaml → ...luster/1.15.5/defaults/kustomization.yaml
diff --git a/...4.5/grafana-dashboards/kustomization.yaml → ...5.5/grafana-dashboards/kustomization.yaml b/...4.5/grafana-dashboards/kustomization.yaml → ...5.5/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/...4.5/grafana-dashboards/rook-ceph-osd.json → ...5.5/grafana-dashboards/rook-ceph-osd.json b/...4.5/grafana-dashboards/rook-ceph-osd.json → ...5.5/grafana-dashboards/rook-ceph-osd.json
diff --git a/...5/grafana-dashboards/rook-ceph-pools.json → ...5/grafana-dashboards/rook-ceph-pools.json b/...5/grafana-dashboards/rook-ceph-pools.json → ...5/grafana-dashboards/rook-ceph-pools.json
diff --git a/...ster/1.14.5/helmrelease/dashboard-cm.yaml → ...ster/1.15.5/helmrelease/dashboard-cm.yaml b/...ster/1.14.5/helmrelease/dashboard-cm.yaml → ...ster/1.15.5/helmrelease/dashboard-cm.yaml
@@ -9,5 +9,5 @@ data:
   name: "Rook Ceph Cluster"
   dashboardLink: "/dkp/kommander/ceph-dashboard/"
   docsLink: "https://docs.ceph.com/en/latest/mgr/dashboard/"
-  # Rook Ceph Version can be found at https://github.com/rook/rook/blob/v1.11.9/deploy/charts/rook-ceph-cluster/values.yaml#L89
-  version: "17.2.6"
+  # Rook Ceph Version can be found at https://github.com/rook/rook/blob/v1.15.5/deploy/charts/rook-ceph-cluster/values.yaml#L97
+  version: "18.2.4"
diff --git a/...uster/1.14.5/helmrelease/helmrelease.yaml → ...uster/1.15.5/helmrelease/helmrelease.yaml b/...uster/1.14.5/helmrelease/helmrelease.yaml → ...uster/1.15.5/helmrelease/helmrelease.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: charts.rook.io-release
         namespace: kommander-flux
-      version: v1.14.5
+      version: v1.15.5
   timeout: 15m
   interval: 15s
   install:
@@ -26,5 +26,5 @@ spec:
   releaseName: rook-ceph-cluster
   valuesFrom:
     - kind: ConfigMap
-      name: rook-ceph-cluster-1.14.5-d2iq-defaults
+      name: rook-ceph-cluster-1.15.5-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/...ter/1.14.5/helmrelease/kustomization.yaml → ...ter/1.15.5/helmrelease/kustomization.yaml b/...ter/1.14.5/helmrelease/kustomization.yaml → ...ter/1.15.5/helmrelease/kustomization.yaml
diff --git a/...ok-ceph-cluster/1.14.5/kustomization.yaml → ...ok-ceph-cluster/1.15.5/kustomization.yaml b/...ok-ceph-cluster/1.14.5/kustomization.yaml → ...ok-ceph-cluster/1.15.5/kustomization.yaml
diff --git a/...-cluster/1.14.5/object-bucket-claims.yaml → ...-cluster/1.15.5/object-bucket-claims.yaml b/...-cluster/1.14.5/object-bucket-claims.yaml → ...-cluster/1.15.5/object-bucket-claims.yaml
@@ -13,7 +13,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.14.5/objectbucketclaims
+  path: ./services/rook-ceph-cluster/1.15.5/objectbucketclaims
   sourceRef:
     kind: GitRepository
     name: management

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

diff --git a/...4.5/objectbucketclaims/kustomization.yaml → ...5.5/objectbucketclaims/kustomization.yaml b/...4.5/objectbucketclaims/kustomization.yaml → ...5.5/objectbucketclaims/kustomization.yaml
diff --git a/...rook-ceph-cluster/1.14.5/pre-install.yaml → ...rook-ceph-cluster/1.15.5/pre-install.yaml b/...rook-ceph-cluster/1.14.5/pre-install.yaml → ...rook-ceph-cluster/1.15.5/pre-install.yaml
@@ -1,15 +1,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: rook-ceph-cluster-prereq-jobs-v1.14.5
+  name: rook-ceph-cluster-prereq-jobs-v1.15.5
   namespace: ${releaseNamespace}
 spec:
   force: true
   prune: true
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.14.5/pre-install
+  path: ./services/rook-ceph-cluster/1.15.5/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.14.5
+      desiredCephOperatorVersion: v1.15.5
diff --git a/...er/1.14.5/pre-install/ceph-crd-check.yaml → ...er/1.15.5/pre-install/ceph-crd-check.yaml b/...er/1.14.5/pre-install/ceph-crd-check.yaml → ...er/1.15.5/pre-install/ceph-crd-check.yaml
diff --git a/...eph-cluster/1.14.5/rook-ceph-cluster.yaml → ...eph-cluster/1.15.5/rook-ceph-cluster.yaml b/...eph-cluster/1.14.5/rook-ceph-cluster.yaml → ...eph-cluster/1.15.5/rook-ceph-cluster.yaml
@@ -6,14 +6,14 @@ metadata:
 spec:
   dependsOn:
     # There can only be one operator per cluster, just ensure CRDs are present, no need to wait for actual operator Deployment.
-    - name: rook-ceph-cluster-prereq-jobs-v1.14.5
+    - name: rook-ceph-cluster-prereq-jobs-v1.15.5
       namespace: ${workspaceNamespace}
   force: false
   prune: true
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.14.5/helmrelease
+  path: ./services/rook-ceph-cluster/1.15.5/helmrelease
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/services/rook-ceph/1.14.5/defaults/cm.yaml → services/rook-ceph/1.15.5/defaults/cm.yaml b/services/rook-ceph/1.14.5/defaults/cm.yaml → services/rook-ceph/1.15.5/defaults/cm.yaml
@@ -1,16 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-1.14.5-d2iq-defaults
+  name: rook-ceph-1.15.5-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
     ---
-    image:
-      # This image was patched to fix CVEs. To build new version of the image:
-      # See: https://github.com/mesosphere/dkp-container-images
-      repository: ghcr.io/mesosphere/dkp-container-images/rook/ceph
-
     crds:
       # CRDs are not installed with "crds" directory and If this flag is disabled post-install, the cluster may be DESTROYED.
       # If the CRDs are deleted in this case, see the disaster recovery guide to restore them.

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