Extend Cache runtime framework Phase 2: support curvine poc

.github/scripts/build-all-images.sh

@@ -20,6 +20,7 @@ function build_images() {
         ${IMG_REPO}/thinruntime-controller:${IMAGE_TAG}
         ${IMG_REPO}/efcruntime-controller:${IMAGE_TAG}
         ${IMG_REPO}/vineyardruntime-controller:${IMAGE_TAG}
+        ${IMG_REPO}/cacheruntime-controller:${IMAGE_TAG}
         ${IMG_REPO}/fluid-csi:${IMAGE_TAG}
         ${IMG_REPO}/fluid-webhook:${IMAGE_TAG}
         ${IMG_REPO}/fluid-crd-upgrader:${IMAGE_TAG}

.github/scripts/gha-e2e.sh

@@ -100,7 +100,13 @@
     bash test/gha-e2e/juicefs/test.sh
 }
 
+function curvine_e2e() {
+    set -e
+    bash test/gha-e2e/curvine/test.sh
+}
+
 check_control_plane_status
 alluxio_e2e
 jindo_e2e
 juicefs_e2e
+curvine_e2e

Makefile

@@ -125,7 +125,7 @@ DOCKER_PUSH += docker-push-webhook
 DOCKER_PUSH += docker-push-goosefsruntime-controller
 DOCKER_PUSH += docker-push-juicefsruntime-controller
 DOCKER_PUSH += docker-push-thinruntime-controller
-#DOCKER_PUSH += docker-push-cacheruntime-controller
+DOCKER_PUSH += docker-push-cacheruntime-controller
 DOCKER_PUSH += docker-push-efcruntime-controller
 DOCKER_PUSH += docker-push-vineyardruntime-controller
 # Not need to push init-users image by default
@@ -143,7 +143,7 @@ DOCKER_BUILDX_PUSH += docker-buildx-push-csi
 DOCKER_BUILDX_PUSH += docker-buildx-push-webhook
 DOCKER_BUILDX_PUSH += docker-buildx-push-juicefsruntime-controller
 DOCKER_BUILDX_PUSH += docker-buildx-push-thinruntime-controller
-#DOCKER_BUILDX_PUSH += docker-buildx-push-cacheruntime-controller
+DOCKER_BUILDX_PUSH += docker-buildx-push-cacheruntime-controller
 DOCKER_BUILDX_PUSH += docker-buildx-push-efcruntime-controller
 DOCKER_BUILDX_PUSH += docker-buildx-push-vineyardruntime-controller
 # Not need to push init-users image by default

api/v1alpha1/cacheruntimeclass_types.go

@@ -60,6 +60,25 @@ type RuntimeComponentDefinition struct {
 	// Dependencies specifies the dependencies required by the component
 	// +optional
 	Dependencies RuntimeComponentDependencies `json:"dependencies,omitempty"`
+
+	// ExecutionEntries entries to support out-of-tree integration.
+	// +optional
+	ExecutionEntries *ExecutionEntries `json:"executionEntries,omitempty"`
+}
+
+type ExecutionEntries struct {
+	// MountUFS defines the operations for mounting UFS
+	MountUFS *ExecutionCommonEntry `json:"mountUFS,omitempty"`
+
+	// ReportSummary it defines the operation how to get cache status like capacity, hit ratio etc.
+	ReportSummary *ExecutionCommonEntry `json:"reportSummary,omitempty"`
+}
+
+type ExecutionCommonEntry struct {
+	Command []string `json:"command"`
+
+	// TimeoutSeconds is the timeout(seconds) for the execution entry, at least(default) 20 seconds.
+	TimeoutSeconds int32 `json:"timeout,omitempty"`
 }
 
 // EncryptOptionComponentDependency defines the configuration for encrypt option dependency

charts/fluid/fluid/crds/data.fluid.io_cacheruntimeclasses.yaml

@@ -63,6 +63,33 @@ spec:
                             type: array
                         type: object
                     type: object
+                  executionEntries:
+                    properties:
+                      mountUFS:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                      reportSummary:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                    type: object
                   options:
                     additionalProperties:
                       type: string
@@ -3453,6 +3480,33 @@ spec:
                             type: array
                         type: object
                     type: object
+                  executionEntries:
+                    properties:
+                      mountUFS:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                      reportSummary:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                    type: object
                   options:
                     additionalProperties:
                       type: string
@@ -6843,6 +6897,33 @@ spec:
                             type: array
                         type: object
                     type: object
+                  executionEntries:
+                    properties:
+                      mountUFS:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                      reportSummary:
+                        properties:
+                          command:
+                            items:
+                              type: string
+                            type: array
+                          timeout:
+                            format: int32
+                            type: integer
+                        required:
+                        - command
+                        type: object
+                    type: object
                   options:
                     additionalProperties:
                       type: string