fix cachedir is memory (#1792)

Signed-off-by: zwwhdls <[email protected]> fix dataload (#1806) Signed-off-by: frankleaf <[email protected]> Refactor jindoruntime, To #40605168 (#1807) Signed-off-by: cheyang <[email protected]> Refactor jindoruntime, To #40605168 (#1808) Signed-off-by: cheyang <[email protected]> separate worker option and fuse option (#1810) Signed-off-by: zwwhdls <[email protected]> Update API for Juicefs, To #40605168 (#1811) Signed-off-by: cheyang <[email protected]> Add jindofsx fuseOnly deploy mode (#1809) * Add jindofsx fuseonly Signed-off-by: frankleaf <[email protected]> * Add jindofsx fuseonly Signed-off-by: frankleaf <[email protected]> * fix test Signed-off-by: frankleaf <[email protected]> * fix test Signed-off-by: frankleaf <[email protected]> * fix ut Signed-off-by: frankleaf <[email protected]> * fix ut Signed-off-by: frankleaf <[email protected]> add application controller doc (#1812) * add application controller doc Signed-off-by: zwwhdls <[email protected]> * fix chinese in en doc Signed-off-by: zwwhdls <[email protected]> * update title Signed-off-by: zwwhdls <[email protected]> Update docker image for jindofsx (#1813) * Add doc for serverless job, To #40605168 Signed-off-by: cheyang <[email protected]> * Add doc for serverless job, To #40605168 Signed-off-by: cheyang <[email protected]> Revert "add application controller doc (#1812)" This reverts commit 2073b38.
fluid-cloudnative · May 3, 2022 · 9630a4c · 9630a4c
1 parent 21293c0
commit 9630a4c
Show file tree

Hide file tree

Showing 128 changed files with 12,508 additions and 608 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -7,10 +7,16 @@ on:
     branches: [ master ]
 
 jobs:
+  staticcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dominikh/staticcheck-action@v1
+
   build:
     env:
       GOPATH: ${{ github.workspace }}
-      GO111MODULE: off
+      GO111MODULE: auto
       CI_TEST_FLAGS: -race -coverprofile=coverage.txt -covermode=atomic
     defaults:
       run:

diff --git a/Makefile b/Makefile
@@ -91,19 +91,19 @@ build: ${BINARY_BUILD}
 csi-build: generate fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/fluid-csi -ldflags '${LDFLAGS}' cmd/csi/main.go
 
-dataset-controller-build: generate fmt vet
+dataset-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/dataset-controller -ldflags '${LDFLAGS}' cmd/dataset/main.go
 
-alluxioruntime-controller-build: generate fmt vet
+alluxioruntime-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/alluxioruntime-controller -ldflags '${LDFLAGS}' cmd/alluxio/main.go
 
-jindoruntime-controller-build: generate fmt vet
+jindoruntime-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/jindoruntime-controller -ldflags '${LDFLAGS}' cmd/jindo/main.go
 
-goosefsruntime-controller-build: generate fmt vet
+goosefsruntime-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/goosefsruntime-controller -ldflags '${LDFLAGS}' cmd/goosefs/main.go
 
-juicefsruntime-controller-build: generate fmt vet
+juicefsruntime-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/juicefsruntime-controller -ldflags '-s -w ${LDFLAGS}' cmd/juicefs/main.go
 
 webhook-build: generate fmt vet
@@ -157,22 +157,22 @@ update-api-doc:
 	bash tools/api-doc-gen/generate_api_doc.sh && mv tools/api-doc-gen/api_doc.md docs/zh/dev/api_doc.md && cp docs/zh/dev/api_doc.md docs/en/dev/api_doc.md
 
 # Build the docker image
-docker-build-dataset-controller: generate fmt vet
+docker-build-dataset-controller: generate gen-openapi fmt vet
 	docker build --no-cache . -f docker/Dockerfile.dataset -t ${DATASET_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-application-controller: generate fmt vet
 	docker build --no-cache . -f docker/Dockerfile.application -t ${APPLICATION_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-alluxioruntime-controller: generate fmt vet
+docker-build-alluxioruntime-controller: generate gen-openapi fmt vet
 	docker build --no-cache . -f docker/Dockerfile.alluxioruntime -t ${ALLUXIORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-jindoruntime-controller: generate fmt vet
+docker-build-jindoruntime-controller: generate gen-openapi fmt vet
 	docker build --no-cache . -f docker/Dockerfile.jindoruntime -t ${JINDORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-goosefsruntime-controller: generate fmt vet
+docker-build-goosefsruntime-controller: generate gen-openapi fmt vet
 	docker build --no-cache . -f docker/Dockerfile.goosefsruntime -t ${GOOSEFSRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-juicefsruntime-controller: generate fmt vet juicefsruntime-controller-build
+docker-build-juicefsruntime-controller: generate gen-openapi fmt vet juicefsruntime-controller-build
 	docker build --no-cache . -f docker/Dockerfile.juicefsruntime -t ${JUICEFSRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-csi: generate fmt vet
@@ -226,6 +226,9 @@ docker-push-all: ${DOCKER_PUSH}
 gen-sdk:
 	./hack/sdk/gen-sdk.sh
 
+gen-openapi:
+	./hack/gen-openapi.sh
+
 # find or download controller-gen
 # download controller-gen if necessary
 controller-gen:

diff --git a/api/v1alpha1/jindoruntime_types.go b/api/v1alpha1/jindoruntime_types.go
@@ -62,6 +62,10 @@ type JindoCompTemplateSpec struct {
 	// Any label already existed will be overriden
 	// +optional
 	Labels map[string]string `json:"labels,omitempty"`
+
+	// If disable JindoFS master or worker
+	// +optional
+	Disabled bool `json:"disabled,omitempty"`
 }
 
 // JindoFuseSpec is a description of the Jindo Fuse
@@ -120,6 +124,10 @@ type JindoFuseSpec struct {
 	// Defaults to OnRuntimeDeleted
 	// +optional
 	CleanPolicy FuseCleanPolicy `json:"cleanPolicy,omitempty"`
+
+	// If disable JindoFS fuse
+	// +optional
+	Disabled bool `json:"disabled,omitempty"`
 }
 
 // JindoRuntimeSpec defines the desired state of JindoRuntime

diff --git a/api/v1alpha1/juicefsruntime_types.go b/api/v1alpha1/juicefsruntime_types.go
@@ -50,6 +50,9 @@ type JuiceFSRuntimeSpec struct {
 	// Tiered storage used by JuiceFS
 	TieredStore TieredStore `json:"tieredstore,omitempty"`
 
+	// Configs of JuiceFS
+	Configs *[]string `json:"configs,omitempty"`
+
 	// The replicas of the worker, need to be specified
 	Replicas int32 `json:"replicas,omitempty"`
 
@@ -79,6 +82,9 @@ type JuiceFSCompTemplateSpec struct {
 	// +optional
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 
+	// Options
+	Options map[string]string `json:"options,omitempty"`
+
 	// Environment variables that will be used by JuiceFS component.
 	Env []corev1.EnvVar `json:"env,omitempty"`
 

diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
diff --git a/api/v1alpha1/swagger.json b/api/v1alpha1/swagger.json
@@ -1907,8 +1907,7 @@
           "type": "string"
         },
         "mountTime": {
-          "description": "MountTime represents time last mount happened if Mounttime is early than master starting time, remount will be required",
-          "default": {},
+          "description": "MountTime represents time last mount happened if Mounttime is earlier than master starting time, remount will be required",
           "$ref": "#/definitions/v1.Time"
         },
         "selector": {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/fluid-dataloader/jindofsx/CHANGELOG.md b/charts/fluid-dataloader/jindofsx/CHANGELOG.md
@@ -0,0 +1,4 @@
+### 0.1.0
+
+- Support parallel prefetch job
+- Support configurations by setting values
diff --git a/charts/fluid-dataloader/jindofsx/Chart.yaml b/charts/fluid-dataloader/jindofsx/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: fluid-dataloader
+description: A Helm chart for Fluid to prefetch data
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+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.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: 0.1.0