feat: Bump rook-ceph-cluster to v1.14.2 (#2170)

Co-authored-by: d2iq-mergebot <[email protected]> Co-authored-by: Tarun Gupta Akirala <[email protected]>
mesosphere · Apr 30, 2024 · a4b2461 · a4b2461
1 parent c555b7f
commit a4b2461
Show file tree

Hide file tree

Showing 24 changed files with 18 additions and 18 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -290,7 +290,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.12.6
+  - container_image: ghcr.io/mesosphere/dkp-container-images/rook/ceph:v1.14.2
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
@@ -451,7 +451,7 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/brancz/kube-rbac-proxy
-  - container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v17.2.6
+  - container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2
     sources:
       - license_path: COPYING
         ref: ${image_tag}

diff --git a/services/dkp-insights/1.1.1/defaults/cm.yaml b/services/dkp-insights/1.1.1/defaults/cm.yaml
@@ -123,7 +123,7 @@ data:
               groupKind:
                 group: kustomize.toolkit.fluxcd.io
                 kind: Kustomization
-              nameRegexp: ai-navigator-cluster-info-agent-helmrelease|ai-navigator-cluster-info-api-helmrelease|centralized-kubecost-post-install-jobs|centralized-kubecost-release|cert-manager-namespace|cert-manager-priorityclass-resource-quota|cert-manager-release|cert-manager-root-ca|dkp-insights-helmrelease|dkp-insights-management-helmrelease|etcd-metrics-proxy|gatekeeper-constraint-templates|gatekeeper-constraints|gatekeeper-release|grafana-loki-helmrelease|grafana-loki-pre-install|istio-helmrelease|jaeger-helmrelease|kube-federation-system-namespace|kube-prometheus-stack-helmrelease|kubefed-federatedtypeconfigs|kubefed-release|nvidia-gpu-operator-helmrelease|object-bucket-claims-helmrelease|prometheus-adapter-helmrelease|rook-ceph-cluster-helmrelease|rook-ceph-cluster-prereq-jobs-v1.12.7|rook-ceph-helmrelease|thanos-jobs|velero-helmrelease|velero-post-install|velero-pre-install
+              nameRegexp: ai-navigator-cluster-info-agent-helmrelease|ai-navigator-cluster-info-api-helmrelease|centralized-kubecost-post-install-jobs|centralized-kubecost-release|cert-manager-namespace|cert-manager-priorityclass-resource-quota|cert-manager-release|cert-manager-root-ca|dkp-insights-helmrelease|dkp-insights-management-helmrelease|etcd-metrics-proxy|gatekeeper-constraint-templates|gatekeeper-constraints|gatekeeper-release|grafana-loki-helmrelease|grafana-loki-pre-install|istio-helmrelease|jaeger-helmrelease|kube-federation-system-namespace|kube-prometheus-stack-helmrelease|kubefed-federatedtypeconfigs|kubefed-release|nvidia-gpu-operator-helmrelease|object-bucket-claims-helmrelease|prometheus-adapter-helmrelease|rook-ceph-cluster-helmrelease|rook-ceph-cluster-prereq-jobs-v1.14.2|rook-ceph-helmrelease|thanos-jobs|velero-helmrelease|velero-post-install|velero-pre-install
             Namespace-additional:
               groupKind:
                 group: ""

diff --git a/...rook-ceph-cluster/1.12.7/defaults/cm.yaml → ...rook-ceph-cluster/1.14.2/defaults/cm.yaml b/...rook-ceph-cluster/1.12.7/defaults/cm.yaml → ...rook-ceph-cluster/1.14.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-cluster-1.12.7-d2iq-defaults
+  name: rook-ceph-cluster-1.14.2-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:v17.2.6
+        image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2
 
       resources:
         mgr-sidecar:

diff --git a/...luster/1.12.7/defaults/kustomization.yaml → ...luster/1.14.2/defaults/kustomization.yaml b/...luster/1.12.7/defaults/kustomization.yaml → ...luster/1.14.2/defaults/kustomization.yaml
diff --git a/...2.7/grafana-dashboards/kustomization.yaml → ...4.2/grafana-dashboards/kustomization.yaml b/...2.7/grafana-dashboards/kustomization.yaml → ...4.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/...2.7/grafana-dashboards/rook-ceph-osd.json → ...4.2/grafana-dashboards/rook-ceph-osd.json b/...2.7/grafana-dashboards/rook-ceph-osd.json → ...4.2/grafana-dashboards/rook-ceph-osd.json
diff --git a/...7/grafana-dashboards/rook-ceph-pools.json → ...2/grafana-dashboards/rook-ceph-pools.json b/...7/grafana-dashboards/rook-ceph-pools.json → ...2/grafana-dashboards/rook-ceph-pools.json
diff --git a/...ster/1.12.7/helmrelease/dashboard-cm.yaml → ...ster/1.14.2/helmrelease/dashboard-cm.yaml b/...ster/1.12.7/helmrelease/dashboard-cm.yaml → ...ster/1.14.2/helmrelease/dashboard-cm.yaml
diff --git a/...uster/1.12.7/helmrelease/helmrelease.yaml → ...uster/1.14.2/helmrelease/helmrelease.yaml b/...uster/1.12.7/helmrelease/helmrelease.yaml → ...uster/1.14.2/helmrelease/helmrelease.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: charts.rook.io-release
         namespace: kommander-flux
-      version: v1.12.6
+      version: v1.14.2
   timeout: 15m
   interval: 15s
   install:
@@ -26,5 +26,5 @@ spec:
   releaseName: rook-ceph-cluster
   valuesFrom:
     - kind: ConfigMap
-      name: rook-ceph-cluster-1.12.7-d2iq-defaults
+      name: rook-ceph-cluster-1.14.2-d2iq-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/...ter/1.12.7/helmrelease/kustomization.yaml → ...ter/1.14.2/helmrelease/kustomization.yaml b/...ter/1.12.7/helmrelease/kustomization.yaml → ...ter/1.14.2/helmrelease/kustomization.yaml
diff --git a/...ok-ceph-cluster/1.12.7/kustomization.yaml → ...ok-ceph-cluster/1.14.2/kustomization.yaml b/...ok-ceph-cluster/1.12.7/kustomization.yaml → ...ok-ceph-cluster/1.14.2/kustomization.yaml
diff --git a/...-cluster/1.12.7/object-bucket-claims.yaml → ...-cluster/1.14.2/object-bucket-claims.yaml b/...-cluster/1.12.7/object-bucket-claims.yaml → ...-cluster/1.14.2/object-bucket-claims.yaml
@@ -13,7 +13,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.12.7/objectbucketclaims
+  path: ./services/rook-ceph-cluster/1.14.2/objectbucketclaims
   sourceRef:
     kind: GitRepository
     name: management

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

diff --git a/...2.7/objectbucketclaims/kustomization.yaml → ...4.2/objectbucketclaims/kustomization.yaml b/...2.7/objectbucketclaims/kustomization.yaml → ...4.2/objectbucketclaims/kustomization.yaml
diff --git a/...rook-ceph-cluster/1.12.7/pre-install.yaml → ...rook-ceph-cluster/1.14.2/pre-install.yaml b/...rook-ceph-cluster/1.12.7/pre-install.yaml → ...rook-ceph-cluster/1.14.2/pre-install.yaml
@@ -1,15 +1,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: rook-ceph-cluster-prereq-jobs-v1.12.7
+  name: rook-ceph-cluster-prereq-jobs-v1.14.2
   namespace: ${releaseNamespace}
 spec:
   force: true
   prune: true
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.12.7/pre-install
+  path: ./services/rook-ceph-cluster/1.14.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.12.6
+      desiredCephOperatorVersion: v1.14.2
diff --git a/...er/1.12.7/pre-install/ceph-crd-check.yaml → ...er/1.14.2/pre-install/ceph-crd-check.yaml b/...er/1.12.7/pre-install/ceph-crd-check.yaml → ...er/1.14.2/pre-install/ceph-crd-check.yaml
diff --git a/...eph-cluster/1.12.7/rook-ceph-cluster.yaml → ...eph-cluster/1.14.2/rook-ceph-cluster.yaml b/...eph-cluster/1.12.7/rook-ceph-cluster.yaml → ...eph-cluster/1.14.2/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.12.7
+    - name: rook-ceph-cluster-prereq-jobs-v1.14.2
       namespace: ${workspaceNamespace}
   force: false
   prune: true
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/rook-ceph-cluster/1.12.7/helmrelease
+  path: ./services/rook-ceph-cluster/1.14.2/helmrelease
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/services/rook-ceph/1.12.7/defaults/cm.yaml → services/rook-ceph/1.14.2/defaults/cm.yaml b/services/rook-ceph/1.12.7/defaults/cm.yaml → services/rook-ceph/1.14.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: rook-ceph-1.12.7-d2iq-defaults
+  name: rook-ceph-1.14.2-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

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