Revert "feat: Bump rook-ceph to v1.12.3 (#1521)"

This reverts commit fb425ad.
mesosphere · Oct 26, 2023 · 6a7368f · 6a7368f
1 parent 25a3c08
commit 6a7368f
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 15 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -301,7 +301,7 @@ resources:
         notice_path: NOTICE
         ref: ${image_tag}
         url: https://github.com/open-policy-agent/gatekeeper
-  - container_image: docker.io/rook/ceph:v1.12.3
+  - container_image: docker.io/rook/ceph:v1.12.1
     sources:
       - license_path: LICENSE
         ref: ${image_tag}

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

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

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

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

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

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