megre(addons)

Author: EamonZhang

addons/fluentbit/2/plans/standard-1000m/meta.yaml

@@ -1,6 +1,10 @@
 name: "standard-1000m"
 id: ac2300db-f5ac-413e-a663-dd13da2034b0
+<<<<<<< HEAD
 description: "Fluentbit standard-1000m plan: vCPUs 1000m, RAM 1G"
+=======
+description: "Fluentbit standard-100m plan: vCPUs 1000m, RAM 1G"
+>>>>>>> ad5012ff6d6a918f761d03fc082781f8a8e170de
 displayName: "standard-1000m"
 bindable: true
 maximum_polling_duration: 1800

addons/fluentbit/2/plans/standard-200m/meta.yaml

@@ -1,6 +1,6 @@
-name: "standard-200m"
+name: "standard-5"
 id: 1b3968b6-ea84-4f34-b1d9-b51e65d01b1c
-description: "Fluentbit standard-200m plan: vCPUs 200m, RAM 128M"
-displayName: "standard-200m"
+description: "Fluentbit standard-5 plan: vCPUs 100m, RAM 128M"
+displayName: "standard-5"
 bindable: true
 maximum_polling_duration: 1800

addons/seaweedfs/3/chart/seaweedfs/templates/cronjob.yaml

@@ -12,7 +12,7 @@ metadata:
   {{- end }}
 spec:
   timeZone: "{{ .Values.cronjob.timeZone }}"
-  schedule: "{{ .Values.cronjob.schedule }}"
+  schedule: "{{ (tpl .Values.cronjob.schedule $) }}"
   concurrencyPolicy: "{{ .Values.cronjob.concurrencyPolicy }}"
   successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
   failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}

addons/seaweedfs/3/chart/seaweedfs/values.yaml

@@ -397,10 +397,12 @@ cronjob:
     volume.deleteEmpty -quietFor=24h -force
     volume.balance -force
     volume.fix.replication
+    volume.fsck -reallyDeleteFromVolume
+    volume.vacuum -garbageThreshold 0
     s3.clean.uploads -timeAgo=24h
     unlock
   timeZone: "Etc/UTC"
-  schedule: "0 */1 * * *"
+  schedule: "{{ mod (randNumeric 3) 60 }} {{ mod (randNumeric 3) 24 }} * * *"
   concurrencyPolicy: "Replace"
   successfulJobsHistoryLimit: 1
   failedJobsHistoryLimit: 1