Merge pull request #31 from cheyang/helm-chart-fluid-1.0.0-alpha.4

Update 1.0.0.alpha.4

charts/fluid/CHANGELOG.md

@@ -55,4 +55,7 @@
 ### 0.9.0
 * Support pass image pull secrets from fluid charts to alluxioruntime controller
 * Fix components rbacs and set Fluid CSI Plugin with node-authorized kube-client
+
+### 1.0.0
 * Fix CSI Plugin loop mount bug
+* Make toleration configurable

charts/fluid/Chart.yaml

@@ -14,11 +14,11 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.8.7
+version: 1.0.0-alpha.4
 
 # 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: 0.8.7-4706d51
+appVersion: 1.0.0-c1d91d5
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

charts/fluid/VERSION

@@ -107,3 +107,9 @@ release-2.8.1-SNAPSHOT-0433ade
 Version: https://github.com/Alluxio/alluxio/commit/0433aded47b69a9bc34bdf7676cb3224a1ddb2a1
 Branch: https://github.com/Alluxio/alluxio/tree/release-2.8.0
 
+20221202:
+
+alluxio/alluxio-dev:2.9.0
+
+Version: https://github.com/Alluxio/alluxio/commit/9b78c5b16f855bf22744e8fcad584f47322da9ce
+Branch: https://github.com/Alluxio/alluxio/tree/release-2.9.0

charts/fluid/crds/data.fluid.io_alluxioruntimes.yaml

@@ -259,7 +259,7 @@ spec:
                   cleanPolicy:
                     description: 'CleanPolicy decides when to clean Alluxio Fuse pods.
                       Currently Fluid supports two policies: OnDemand and OnRuntimeDeleted
-                      OnDemand cleans fuse pod once th fuse pod on some node is not
+                      OnDemand cleans fuse pod once the fuse pod on some node is not
                       needed OnRuntimeDeleted cleans fuse pod only when the cache
                       runtime is deleted Defaults to OnRuntimeDeleted'
                     type: string
@@ -731,6 +731,49 @@ spec:
                 items:
                   type: string
                 type: array
+              management:
+                description: RuntimeManagement defines policies when managing the
+                  runtime
+                properties:
+                  cleanCachePolicy:
+                    description: CleanCachePolicy defines the policy of cleaning cache
+                      when shutting down the runtime
+                    properties:
+                      gracePeriodSeconds:
+                        default: 60
+                        description: Optional duration in seconds the cache needs
+                          to clean gracefully. May be decreased in delete runtime
+                          request. Value must be non-negative integer. The value zero
+                          indicates clean immediately via the timeout command (no
+                          opportunity to shut down). If this value is nil, the default
+                          grace period will be used instead. The grace period is the
+                          duration in seconds after the processes running in the pod
+                          are sent a termination signal and the time when the processes
+                          are forcibly halted with timeout command. Set this value
+                          longer than the expected cleanup time for your process.
+                        format: int32
+                        type: integer
+                      maxRetryAttempts:
+                        default: 3
+                        description: Optional max retry Attempts when cleanCache function
+                          returns an error after execution, runtime attempts to run
+                          it three more times by default. With Maximum Retry Attempts,
+                          you can customize the maximum number of retries. This gives
+                          you the option to continue processing retries.
+                        format: int32
+                        type: integer
+                    type: object
+                  metadataSyncPolicy:
+                    description: MetadataSyncPolicy defines the policy of syncing
+                      metadata when setting up the runtime. If not set,
+                    properties:
+                      autoSync:
+                        default: true
+                        description: AutoSync enables automatic metadata sync when
+                          setting up a runtime. If not set, it defaults to true.
+                        type: boolean
+                    type: object
+                type: object
               master:
                 description: The component spec of Alluxio master
                 properties:
@@ -4318,6 +4361,63 @@ spec:
                   is earlier than master starting time, remount will be required
                 format: date-time
                 type: string
+              mounts:
+                description: MountPoints represents the mount points specified in
+                  the bounded dataset
+                items:
+                  description: Mount describes a mounting. <br> Refer to <a href="https://docs.alluxio.io/os/user/stable/en/ufs/S3.html">Alluxio
+                    Storage Integrations</a> for more info
+                  properties:
+                    encryptOptions:
+                      description: The secret information
+                      items:
+                        properties:
+                          name:
+                            description: The name of encryptOption
+                            type: string
+                          valueFrom:
+                            description: The valueFrom of encryptOption
+                            properties:
+                              secretKeyRef:
+                                description: The encryptInfo obtained from secret
+                                properties:
+                                  key:
+                                    description: The required key in the secret
+                                    type: string
+                                  name:
+                                    description: The name of required secret
+                                    type: string
+                                type: object
+                            type: object
+                        type: object
+                      type: array
+                    mountPoint:
+                      description: MountPoint is the mount point of source.
+                      minLength: 5
+                      type: string
+                    name:
+                      description: The name of mount
+                      minLength: 0
+                      type: string
+                    options:
+                      additionalProperties:
+                        type: string
+                      description: The Mount Options. <br> Refer to <a href="https://docs.alluxio.io/os/user/stable/en/reference/Properties-List.html">Mount
+                        Options</a>.  <br> The option has Prefix 'fs.' And you can
+                        Learn more from <a href="https://docs.alluxio.io/os/user/stable/en/ufs/S3.html">The
+                        Storage Integrations</a>
+                      type: object
+                    path:
+                      description: The path of mount, if not set will be /{Name}
+                      type: string
+                    readOnly:
+                      description: 'Optional: Defaults to false (read-write).'
+                      type: boolean
+                    shared:
+                      description: 'Optional: Defaults to false (shared).'
+                      type: boolean
+                  type: object
+                type: array
               selector:
                 description: Selector is used for auto-scaling
                 type: string

charts/fluid/crds/data.fluid.io_databackups.yaml

@@ -26,10 +26,10 @@ spec:
     - jsonPath: .status.phase
       name: Phase
       type: string
-    - jsonPath: .status.backupLocation.path
+    - jsonPath: .status.infos.BackupLocationPath
       name: Path
       type: string
-    - jsonPath: .status.backupLocation.nodeName
+    - jsonPath: .status.infos.BackupLocationNodeName
       name: NodeName
       type: string
     - jsonPath: .status.duration
@@ -90,23 +90,10 @@ spec:
                 type: object
             type: object
           status:
-            description: DataBackupStatus defines the observed state of DataBackup
+            description: OperationStatus defines the observed state of operation
             properties:
-              backupLocation:
-                description: BackupLocation tell user the location to save data of
-                  the DataBackup
-                properties:
-                  nodeName:
-                    description: NodeName describes the nodeName of backup if Path
-                      is in the form of local://subpath
-                    type: string
-                  path:
-                    description: Path describes the path of backup, in the form of
-                      local:///absolutePath or pvc://<pvcName>/subpath
-                    type: string
-                type: object
               conditions:
-                description: Conditions consists of transition information on DataBackup's
+                description: Conditions consists of transition information on operation's
                   Phase
                 items:
                   description: Condition explains the transitions on phase
@@ -141,10 +128,25 @@ spec:
                   type: object
                 type: array
               duration:
-                description: Duration tell user how much time was spent to backup
+                description: Duration tell user how much time was spent to operation
+                type: string
+              infos:
+                additionalProperties:
+                  type: string
+                description: Infos operation customized name-value
+                type: object
+              lastScheduleTime:
+                description: LastScheduleTime is the last time the cron operation
+                  was scheduled
+                format: date-time
+                type: string
+              lastSuccessfulTime:
+                description: LastSuccessfulTime is the last time the cron operation
+                  successfully completed
+                format: date-time
                 type: string
               phase:
-                description: Phase describes current phase of DataBackup
+                description: Phase describes current phase of operation
                 type: string
             required:
             - conditions