refactor(EACRuntime): remane eacruntime-controller to efcruntime-cont…

…roller Signed-off-by: zhanyi <[email protected]>
fluid-cloudnative · Apr 14, 2023 · 1430c2a · 1430c2a
1 parent 4288c01
commit 1430c2a
Show file tree

Hide file tree

Showing 46 changed files with 346 additions and 345 deletions.
diff --git a/charts/efc/templates/_helpers.tpl b/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 }}

diff --git a/charts/efc/templates/fuse/daemonset.yaml b/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:

diff --git a/charts/efc/templates/master/statefulset.yaml b/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:

diff --git a/charts/efc/templates/worker/configmap.yaml b/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":[]}
diff --git a/charts/efc/templates/worker/statefulset.yaml b/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:

diff --git a/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml b/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml
@@ -65,19 +65,19 @@ spec:
             value: {{ .Values.runtime.syncRetryDuration | quote }}
           {{- end }}
           {{- if .Values.runtime.efc.init.image }}
-          - name: EAC_INIT_FUSE_IMAGE_ENV
+          - name: EFC_INIT_FUSE_IMAGE_ENV
             value: {{ .Values.runtime.efc.init.image | quote }}
           {{- end }}
           {{- if .Values.runtime.efc.master.image }}
-          - name: EAC_MASTER_IMAGE_ENV
+          - name: EFC_MASTER_IMAGE_ENV
             value: {{ .Values.runtime.efc.master.image | quote }}
           {{- end }}
           {{- if .Values.runtime.efc.worker.image }}
-          - name: EAC_WORKER_IMAGE_ENV
+          - name: EFC_WORKER_IMAGE_ENV
             value: {{ .Values.runtime.efc.worker.image | quote }}
           {{- end }}
           {{- if .Values.runtime.efc.fuse.image }}
-          - name: EAC_FUSE_IMAGE_ENV
+          - name: EFC_FUSE_IMAGE_ENV
             value: {{ .Values.runtime.efc.fuse.image | quote }}
           {{- end }}
         ports:

diff --git a/cmd/efc/app/efc.go b/cmd/efc/app/efc.go
@@ -99,7 +99,7 @@ func handle() {
 		MetricsBindAddress:      metricsAddr,
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionNamespace: leaderElectionNamespace,
-		LeaderElectionID:        "eac.data.fluid.io",
+		LeaderElectionID:        "efc.data.fluid.io",
 		Port:                    9443,
 	})
 	if err != nil {

diff --git a/docs/zh/troubleshooting/debug-fuse.md b/docs/zh/troubleshooting/debug-fuse.md
@@ -57,8 +57,8 @@ I0210 17:50:36.916699    5193 utils.go:97] GRPC call: /csi.v1.Node/NodeStageVolu
 I0210 17:50:36.916709    5193 utils.go:98] GRPC request: {"staging_target_path":"/var/lib/kubelet/plugins/kubernetes.io/csi/f
 use.csi.fluid.io/dfed9324cd62d4e5384eff9613dd92ef318504fcada75b371ce827a0cba19f46/globalmount","volume_capability":{"AccessTy
 pe":{"Mount":{}},"access_mode":{"mode":3}},"volume_context":{"fluid_path":"/runtime-mnt/eac/default/eac-demo/eac-fuse","mount
-_type":"alifuse.aliyun-alinas-eac","runtime_name":"eac-demo","runtime_namespace":"default"},"volume_id":"default-eac-demo"}
-I0210 17:50:36.916793    5193 nodeserver.go:270] NodeStageVolume: Starting NodeStage with VolumeId: default-eac-demo, and Vol
+_type":"alifuse.aliyun-alinas-eac","runtime_name":"eac-demo","runtime_namespace":"default"},"volume_id":"default-efc-demo"}
+I0210 17:50:36.916793    5193 nodeserver.go:270] NodeStageVolume: Starting NodeStage with VolumeId: default-efc-demo, and Vol
 umeContext: map[fluid_path:/runtime-mnt/eac/default/eac-demo/eac-fuse mount_type:alifuse.aliyun-alinas-eac runtime_name:eac-d
 emo runtime_namespace:default]
 ```

diff --git a/pkg/common/eac.go b/pkg/common/eac.go