Explorar el Código

add deviceclass to backup rook

Josh Bicking hace 6 días
padre
commit
722fe5ca50

+ 23 - 21
backup/applications.yaml

@@ -53,8 +53,10 @@ spec:
     automated:
       enabled: true
 ---
-# If rook ever needs a full re-provisioning, the operator must complete before
-# the cluster deployment starts.
+# Should rook ever need full re-provisioning, applications must be deployed in this order:
+#  - operator
+#  - manifests (to configure the .mgr pool)
+#  - cluster
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -84,6 +86,25 @@ spec:
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
+metadata:
+  name: rook-manifest
+  namespace: argocd
+spec:
+  destination:
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: backup/rook-manifest
+    repoURL: https://gogs.jibby.org/jhb2345/server
+    targetRevision: HEAD
+    directory:
+      recurse: true
+  syncPolicy:
+    automated:
+      enabled: true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
 metadata:
   name: rook-ceph-cluster
   namespace: argocd
@@ -114,25 +135,6 @@ spec:
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
-metadata:
-  name: rook-manifest
-  namespace: argocd
-spec:
-  destination:
-    server: https://kubernetes.default.svc
-  project: default
-  source:
-    path: backup/rook-manifest
-    repoURL: https://gogs.jibby.org/jhb2345/server
-    targetRevision: HEAD
-    directory:
-      recurse: true
-  syncPolicy:
-    automated:
-      enabled: true
----
-apiVersion: argoproj.io/v1alpha1
-kind: Application
 metadata:
   name: external-secrets
   namespace: argocd

+ 1 - 0
backup/rook-manifest/builtin-mgr.yaml

@@ -13,6 +13,7 @@ spec:
   # the pool name created in Ceph with this name property.
   name: .mgr
   failureDomain: osd
+  deviceClass: hdd
   replicated:
     size: 3
     requireSafeReplicaSize: true

+ 3 - 0
backup/rook/rook-ceph-cluster-values.yaml

@@ -91,6 +91,7 @@ cephBlockPools:
   - name: ceph-blockpool
     spec:
       failureDomain: osd
+      deviceClass: hdd
       erasureCoded:
         dataChunks: 2
         codingChunks: 1
@@ -118,10 +119,12 @@ cephObjectStores:
     spec:
       metadataPool:
         failureDomain: osd
+        deviceClass: hdd
         replicated:
           size: 3
       dataPool:
         failureDomain: osd
+        deviceClass: hdd
         erasureCoded:
           dataChunks: 2
           codingChunks: 1