resolve conflicts

Chart.yaml

@@ -16,4 +16,4 @@ maintainers:
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 # appVersion: 1.5.0-pre3
-appVersion: v1.15.3
+appVersion: v1.16.0

values.yaml

@@ -71,11 +71,11 @@ persistence:
   # If persistence is set to false no persistent volumes will be created
   enabled: true
   hostPath: /nvme/disk
-  autoResizer:
-    enabled: true
-    increaseThreshold: 90 # in %
-    increaseStep: 10 # in %
-    cron: "0 0 * * *"
+  # autoResizer:
+  #   enabled: true
+  #   increaseThreshold: 90 # in %
+  #   increaseStep: 10 # in %
+  #   cron: "0 0 * * *"
   snapshots:
     # If uploadToIpfs is set to true the internal Lotus snapshot will be created and uploaded to the IPFS system. Note that IPFS must be nenabled in that case
     uploadToIpfs:
@@ -106,13 +106,13 @@ persistence:
       #name: snapshot-blah
   # For each of the deployed services one can specify the disk size, custom disk type and access mode.
   lotus:
-    size: "35Gi"
+    size: "50Gi"
     accessModes:
       - ReadWriteOnce
     storageClassName: "ebs-sc-gp2"
     lotusVolumeName: "vol-lotus"
   ipfs:
-    size: "10Gi"
+    size: "16Gi"
     accessModes:
       - ReadWriteOnce
 

values/dev/network/calibrationapi.yaml

@@ -44,6 +44,13 @@ persistence:
   ipfs:
     size: "20Gi"
 
+# init:
+#   importSnapshot:
+#     SNAPSHOTURL: "/home/lotus_user/.lotus/chain.car"
+#     enabled: true
+  # clearRestart:
+  #   enabled: true
+
 resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

values/mainnet/network/space00.yaml

@@ -17,7 +17,7 @@ image:
 
 persistence:
   autoResizer:
-    cron: "0 */6 * * *"
+    enabled: false
   snapshots:
     uploadToIpfs:
       cron: "10 */12 * * *"
@@ -29,10 +29,10 @@ persistence:
         address: [email protected]:d03393d1f6e70e089e9e8d18922474f6.git
         authorName: Protofire Bot
         authorEmail: [email protected]
-    automation:
-      deletion:
-        retention:
-          count: 7
+    # automation:
+    #   deletion:
+    #     retention:
+    #       count: 7
     restore:
       enabled: true
       name: imported-aws-snapshot