Merge 1430c2a into fc62405

Makefile

@@ -11,7 +11,7 @@ JINDORUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/jindoruntime-controller
 GOOSEFSRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/goosefsruntime-controller
 JUICEFSRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/juicefsruntime-controller
 THINRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/thinruntime-controller
-EACRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/eacruntime-controller
+EFCRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/efcruntime-controller
 CSI_IMG ?= ${IMG_REPO}/fluid-csi
 LOADER_IMG ?= ${IMG_REPO}/fluid-dataloader
 INIT_USERS_IMG ?= ${IMG_REPO}/init-users
@@ -53,7 +53,7 @@ BINARY_BUILD += alluxioruntime-controller-build
 BINARY_BUILD += jindoruntime-controller-build
 BINARY_BUILD += juicefsruntime-controller-build
 BINARY_BUILD += thinruntime-controller-build
-BINARY_BUILD += eacruntime-controller-build
+BINARY_BUILD += efcruntime-controller-build
 BINARY_BUILD += csi-build
 BINARY_BUILD += webhook-build
 
@@ -67,7 +67,7 @@ DOCKER_BUILD += docker-build-csi
 DOCKER_BUILD += docker-build-webhook
 DOCKER_BUILD += docker-build-juicefsruntime-controller
 DOCKER_BUILD += docker-build-thinruntime-controller
-DOCKER_BUILD += docker-build-eacruntime-controller
+DOCKER_BUILD += docker-build-efcruntime-controller
 DOCKER_BUILD += docker-build-init-users
 DOCKER_BUILD += docker-build-crd-upgrader
 
@@ -81,7 +81,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-eacruntime-controller
+DOCKER_PUSH += docker-push-efcruntime-controller
 DOCKER_PUSH += docker-push-init-users
 DOCKER_PUSH += docker-push-crd-upgrader
 
@@ -95,7 +95,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-eacruntime-controller
+DOCKER_BUILDX_PUSH += docker-buildx-push-efcruntime-controller
 DOCKER_BUILDX_PUSH += docker-buildx-push-init-users
 DOCKER_BUILDX_PUSH += docker-buildx-push-crd-upgrader
 
@@ -142,8 +142,8 @@ juicefsruntime-controller-build: generate gen-openapi fmt vet
 thinruntime-controller-build: generate gen-openapi fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/thinruntime-controller -ldflags '-s -w ${LDFLAGS}' cmd/thin/main.go
 
-eacruntime-controller-build: generate gen-openapi fmt vet
-	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/eacruntime-controller -ldflags '${LDFLAGS}' cmd/eac/main.go
+efcruntime-controller-build: generate gen-openapi fmt vet
+	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/efcruntime-controller -ldflags '${LDFLAGS}' cmd/efc/main.go
 
 webhook-build: generate fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/fluid-webhook -ldflags '${LDFLAGS}' cmd/webhook/main.go
@@ -217,8 +217,8 @@ docker-build-juicefsruntime-controller: generate gen-openapi fmt vet juicefsrunt
 docker-build-thinruntime-controller: generate gen-openapi fmt vet thinruntime-controller-build
 	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.thinruntime -t ${THINRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-eacruntime-controller: generate gen-openapi fmt vet
-	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.eacruntime -t ${EACRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
+docker-build-efcruntime-controller: generate gen-openapi fmt vet
+	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.efcruntime -t ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-build-csi: generate fmt vet
 	docker build --no-cache . -f docker/Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}
@@ -257,8 +257,8 @@ docker-push-juicefsruntime-controller: docker-build-juicefsruntime-controller
 docker-push-thinruntime-controller: docker-build-thinruntime-controller
 	docker push ${THINRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-push-eacruntime-controller: docker-build-eacruntime-controller
-	docker push ${EACRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
+docker-push-efcruntime-controller: docker-build-efcruntime-controller
+	docker push ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-push-csi: docker-build-csi
 	docker push ${CSI_IMG}:${GIT_VERSION}
@@ -297,8 +297,8 @@ docker-buildx-push-juicefsruntime-controller: generate gen-openapi fmt vet juice
 docker-buildx-push-thinruntime-controller: generate gen-openapi fmt vet thinruntime-controller-build
 	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.thinruntime -t ${THINRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-buildx-push-eacruntime-controller: generate gen-openapi fmt vet
-	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.eacruntime -t ${EACRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
+docker-buildx-push-efcruntime-controller: generate gen-openapi fmt vet
+	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.efcruntime -t ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-buildx-push-csi: generate fmt vet
 	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}

charts/eac/Chart.yaml → charts/efc/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-name: eac
+name: efc
 description: A fuse filesystem for NAS with distributed cache.
 version: 0.1.4
 maintainers:

charts/eac/README.md → charts/efc/README.md

@@ -1,2 +1,2 @@
-# EAC (Elastic Accelerate Client)
-EAC 是一款由阿里云文件存储团队研发的针对 NAS 的用户态客户端，并在提供分布式缓存的同时，保证多客户端之间的缓存一致性。
+# EFC (Elastic File Client)
+EFC 是一款由阿里云文件存储团队研发的针对 NAS 的用户态客户端，并在提供分布式缓存的同时，保证多客户端之间的缓存一致性。

charts/eac/templates/_helpers.tpl → charts/efc/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "eac.name" -}}
+{{- define "efc.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "eac.fullname" -}}
+{{- define "efc.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,11 +27,11 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "eac.chart" -}}
+{{- define "efc.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "eac.tieredstoreVolumeMounts" -}}
+{{- define "efc.tieredstoreVolumeMounts" -}}
   {{- if .tieredstore.levels }}
     {{- range .tieredstore.levels }}
       {{- /* The mediumtype can have multiple parts like MEM,SSD */}}
@@ -56,7 +56,7 @@ Create chart name and version as used by the chart label.
   {{- end}}
 {{- end -}}
 
-{{- define "eac.tieredstoreVolumes" -}}
+{{- define "efc.tieredstoreVolumes" -}}
   {{- if .tieredstore.levels }}
     {{- range .tieredstore.levels }}
       {{- if .mediumtype }}

charts/eac/templates/fuse/daemonset.yaml → charts/efc/templates/fuse/daemonset.yaml

@@ -1,10 +1,10 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ template "eac.fullname" . }}-fuse
+  name: {{ template "efc.fullname" . }}-fuse
   labels:
-    app: {{ template "eac.name" . }}
-    chart: {{ template "eac.chart" . }}
+    app: {{ template "efc.name" . }}
+    chart: {{ template "efc.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: eac-fuse
@@ -22,8 +22,8 @@ spec:
     type: {{ .Values.fuse.updateStrategy.type }}
   selector:
     matchLabels:
-      app: {{ template "eac.name" . }}
-      chart: {{ template "eac.chart" . }}
+      app: {{ template "efc.name" . }}
+      chart: {{ template "efc.chart" . }}
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
       role: eac-fuse
@@ -37,8 +37,8 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        app: {{ template "eac.name" . }}
-        chart: {{ template "eac.chart" . }}
+        app: {{ template "efc.name" . }}
+        chart: {{ template "efc.chart" . }}
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: eac-fuse
@@ -105,10 +105,10 @@ spec:
             - name: eac-fuse-mount
               mountPath: /eac
               mountPropagation: Bidirectional
-            - name: eac-worker-endpoints
+            - name: efc-worker-endpoints
               mountPath: /etc/eac
             {{- if .Values.fuse.tieredstore }}
-{{- include "eac.tieredstoreVolumeMounts" .Values.fuse }}
+{{- include "efc.tieredstoreVolumeMounts" .Values.fuse }}
             {{- end }}
             - name: eac-sock
               mountPath: /var/run/eac
@@ -121,11 +121,11 @@ spec:
           hostPath:
             path: {{ .Values.fuse.hostMountPath }}
             type: DirectoryOrCreate
-        - name: eac-worker-endpoints
+        - name: efc-worker-endpoints
           configMap:
-            name: {{ template "eac.fullname" . }}-worker-endpoints
+            name: {{ template "efc.fullname" . }}-worker-endpoints
         {{- if .Values.fuse.tieredstore }}
-{{- include "eac.tieredstoreVolumes" .Values.fuse }}
+{{- include "efc.tieredstoreVolumes" .Values.fuse }}
         {{- end }}
         - name: host-os
           hostPath:

charts/eac/templates/master/statefulset.yaml → charts/efc/templates/master/statefulset.yaml

@@ -1,11 +1,11 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "eac.fullname" . }}-master
+  name: {{ template "efc.fullname" . }}-master
   labels:
-    name: {{ template "eac.fullname" . }}-master
-    app: {{ template "eac.name" . }}
-    chart: {{ template "eac.chart" . }}
+    name: {{ template "efc.fullname" . }}-master
+    app: {{ template "efc.name" . }}
+    chart: {{ template "efc.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: eac-master
@@ -21,11 +21,11 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ template "eac.name" . }}
+      app: {{ template "efc.name" . }}
       role: eac-master
-      name: {{ template "eac.fullname" . }}-master
+      name: {{ template "efc.fullname" . }}-master
   replicas: {{ if .Values.master.enabled -}} {{ $.Values.master.count }} {{ else -}} 0 {{ end }}
-  serviceName: {{ template "eac.fullname" . }}-master
+  serviceName: {{ template "efc.fullname" . }}-master
   template:
     metadata:
       annotations:
@@ -36,9 +36,9 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        name: {{ template "eac.fullname" . }}-master
-        app: {{ template "eac.name" . }}
-        chart: {{ template "eac.chart" . }}
+        name: {{ template "efc.fullname" . }}-master
+        app: {{ template "efc.name" . }}
+        chart: {{ template "efc.chart" . }}
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: eac-master
@@ -110,16 +110,16 @@ spec:
               exec:
                 command: ["sh", "-c", "/entrypoint.sh stop_master /eac/eac-master"]
           volumeMounts:
-            - name: eac-worker-endpoints
+            - name: efc-worker-endpoints
               mountPath: /etc/eac
             {{- if .Values.master.tieredstore }}
-{{- include "eac.tieredstoreVolumeMounts" .Values.master }}
+{{- include "efc.tieredstoreVolumeMounts" .Values.master }}
             {{- end }}
             - name: localtime
               mountPath: /etc/localtime
             - name: eac-sock
               mountPath: /var/run/eac
-        - name: eac-sessmgr
+        - name: efc-sessmgr
           image: {{ .Values.master.image }}:{{ .Values.master.imageTag }}
           imagePullPolicy: {{ .Values.master.imagePullPolicy }}
           command: [ "/entrypoint.sh" ]
@@ -141,11 +141,11 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        - name: eac-worker-endpoints
+        - name: efc-worker-endpoints
           configMap:
-            name: {{ template "eac.fullname" . }}-worker-endpoints
+            name: {{ template "efc.fullname" . }}-worker-endpoints
         {{- if .Values.master.tieredstore }}
-{{- include "eac.tieredstoreVolumes" .Values.master }}
+{{- include "efc.tieredstoreVolumes" .Values.master }}
         {{- end }}
         - name: localtime
           hostPath:

charts/eac/templates/worker/configmap.yaml → charts/efc/templates/worker/configmap.yaml

@@ -3,13 +3,13 @@ kind: ConfigMap
 metadata:
   annotations:
     "helm.sh/hook": pre-install,post-delete,pre-upgrade
-  name: {{ template "eac.fullname" . }}-worker-endpoints
+  name: {{ template "efc.fullname" . }}-worker-endpoints
   labels:
-    app: {{ template "eac.name" . }}
-    chart: {{ template "eac.chart" . }}
+    app: {{ template "efc.name" . }}
+    chart: {{ template "efc.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-    role: eac-worker-endpoints
+    role: efc-worker-endpoints
   ownerReferences:
   {{- if .Values.owner.enabled }}
   - apiVersion: {{ .Values.owner.apiVersion }}
@@ -20,5 +20,5 @@ metadata:
     uid: {{ .Values.owner.uid }}
   {{- end }}
 data:
-  eac-worker-endpoints.json: |
+  efc-worker-endpoints.json: |
     {"containerendpoints":[]}

charts/eac/templates/worker/statefulset.yaml → charts/efc/templates/worker/statefulset.yaml

@@ -1,10 +1,10 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "eac.fullname" . }}-worker
+  name: {{ template "efc.fullname" . }}-worker
   labels:
-    app: {{ template "eac.name" . }}
-    chart: {{ template "eac.chart" . }}
+    app: {{ template "efc.name" . }}
+    chart: {{ template "efc.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: eac-worker
@@ -22,10 +22,10 @@ metadata:
 spec:
   podManagementPolicy: "Parallel"
   replicas: {{ if .Values.worker.enabled -}} {{ $.Values.worker.count }} {{ else -}} 0 {{ end }}
-  serviceName: {{ template "eac.fullname" . }}-worker
+  serviceName: {{ template "efc.fullname" . }}-worker
   selector:
     matchLabels:
-      app: {{ template "eac.name" . }}
+      app: {{ template "efc.name" . }}
       release: {{ .Release.Name }}
       role: eac-worker
   template:
@@ -38,8 +38,8 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        app: {{ template "eac.name" . }}
-        chart: {{ template "eac.chart" . }}
+        app: {{ template "efc.name" . }}
+        chart: {{ template "efc.chart" . }}
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: eac-worker
@@ -82,7 +82,7 @@ spec:
             name: rpc
           volumeMounts:
             {{- if .Values.worker.tieredstore }}
-{{- include "eac.tieredstoreVolumeMounts" .Values.worker }}
+{{- include "efc.tieredstoreVolumeMounts" .Values.worker }}
             {{- end }}
             - name: localtime
               mountPath: /etc/localtime
@@ -92,7 +92,7 @@ spec:
       {{- end }}
       volumes:
         {{- if .Values.worker.tieredstore }}
-{{- include "eac.tieredstoreVolumes" .Values.worker }}
+{{- include "efc.tieredstoreVolumes" .Values.worker }}
         {{- end }}
         - name: localtime
           hostPath:

charts/eac/values.yaml → charts/efc/values.yaml

@@ -1,4 +1,4 @@
-# Default values for eac.
+# Default values for efc.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -51,10 +51,10 @@ fuse:
   image: image-work-in-progress
   imageTag: update
   imagePullPolicy: Always
-  option: g_tier_EnableClusterCache=true,g_unas_InodeAttrExpireTimeoutSec=100,g_unas_InodeEntryExpireTimeoutSec=100,assign_uuid=test-eac-helm-fuse
-  mountPoint: eac://nas-mount-point
-  # eac will mount mountPoint on /eac/eac-fuse in container which will be shared at hostMountPath/eac-fuse on host
-  hostMountPath: /test-mnt/eac-mnt/charts
+  option: g_tier_EnableClusterCache=true,g_unas_InodeAttrExpireTimeoutSec=100,g_unas_InodeEntryExpireTimeoutSec=100,assign_uuid=test-efc-helm-fuse
+  mountPoint: efc://nas-mount-point
+  # efc will mount mountPoint on /efc/efc-fuse in container which will be shared at hostMountPath/efc-fuse on host
+  hostMountPath: /test-mnt/efc-mnt/charts
   tieredstore:
     levels:
       - level: 0
@@ -82,8 +82,8 @@ master:
   image: image-work-in-progress
   imageTag: update
   imagePullPolicy: Always
-  option: g_tier_EnableClusterCache=true,g_unas_InodeAttrExpireTimeoutSec=100,g_unas_InodeEntryExpireTimeoutSec=100,assign_uuid=test-eac-helm-master
-  mountPoint: eac://nas-mount-point
+  option: g_tier_EnableClusterCache=true,g_unas_InodeAttrExpireTimeoutSec=100,g_unas_InodeEntryExpireTimeoutSec=100,assign_uuid=test-efc-helm-master
+  mountPoint: efc://nas-mount-point
   tieredstore:
     levels:
       - level: 0