Revert "Implement vineyard runtime engine and controller (fluid-cloud…

…native#3649)" This reverts commit 45b9c92.
xliuqq · Jan 17, 2024 · fe79f31 · fe79f31
1 parent 9b14925
commit fe79f31
Show file tree

Hide file tree

Showing 80 changed files with 59 additions and 9,967 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,6 @@ GOOSEFSRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/goosefsruntime-controller
 JUICEFSRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/juicefsruntime-controller
 THINRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/thinruntime-controller
 EFCRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/efcruntime-controller
-VINEYARDRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/vineyardruntime-controller
 CSI_IMG ?= ${IMG_REPO}/fluid-csi
 LOADER_IMG ?= ${IMG_REPO}/fluid-dataloader
 INIT_USERS_IMG ?= ${IMG_REPO}/init-users
@@ -55,7 +54,6 @@ BINARY_BUILD += jindoruntime-controller-build
 BINARY_BUILD += juicefsruntime-controller-build
 BINARY_BUILD += thinruntime-controller-build
 BINARY_BUILD += efcruntime-controller-build
-BINARY_BUILD += vineyardruntime-controller-build
 BINARY_BUILD += csi-build
 BINARY_BUILD += webhook-build
 
@@ -70,7 +68,6 @@ DOCKER_BUILD += docker-build-webhook
 DOCKER_BUILD += docker-build-juicefsruntime-controller
 DOCKER_BUILD += docker-build-thinruntime-controller
 DOCKER_BUILD += docker-build-efcruntime-controller
-DOCKER_BUILD += docker-build-vineyardruntime-controller
 DOCKER_BUILD += docker-build-init-users
 DOCKER_BUILD += docker-build-crd-upgrader
 
@@ -85,7 +82,6 @@ DOCKER_PUSH += docker-push-goosefsruntime-controller
 DOCKER_PUSH += docker-push-juicefsruntime-controller
 DOCKER_PUSH += docker-push-thinruntime-controller
 DOCKER_PUSH += docker-push-efcruntime-controller
-DOCKER_PUSH += docker-push-vineyardruntime-controller
 # Not need to push init-users image by default
 # DOCKER_PUSH += docker-push-init-users
 DOCKER_PUSH += docker-push-crd-upgrader
@@ -178,9 +174,6 @@ juicefsruntime-controller-build:
 thinruntime-controller-build:
 	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
 
-vineyardruntime-controller-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=${GO_MODULE}  go build ${GC_FLAGS} -a -o bin/vineyardruntime-controller -ldflags '-s -w ${LDFLAGS}' cmd/vineyard/main.go
-
 efcruntime-controller-build:
 	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
 
@@ -215,9 +208,6 @@ docker-build-thinruntime-controller:
 docker-build-efcruntime-controller:
 	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.efcruntime -t ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-vineyardruntime-controller:
-	docker build --no-cache --build-arg TARGETARCH=${ARCH} . -f docker/Dockerfile.vineyardruntime -t ${VINEYARDRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
-
 docker-build-csi:
 	docker build --no-cache . -f docker/Dockerfile.csi -t ${CSI_IMG}:${GIT_VERSION}
 
@@ -255,9 +245,6 @@ docker-push-thinruntime-controller: docker-build-thinruntime-controller
 docker-push-efcruntime-controller: docker-build-efcruntime-controller
 	docker push ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-push-vineyardruntime-controller: docker-build-vineyardruntime-controller
-	docker push ${VINEYARDRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
-
 docker-push-csi: docker-build-csi
 	docker push ${CSI_IMG}:${GIT_VERSION}
 
@@ -298,9 +285,6 @@ docker-buildx-push-thinruntime-controller:
 docker-buildx-push-efcruntime-controller:
 	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.efcruntime -t ${EFCRUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-buildx-push-vineyardruntime-controller:
-	docker buildx build --push --platform linux/amd64,linux/arm64 --no-cache . -f docker/Dockerfile.vineyardruntime -t ${VINAYARDRUNTIME_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}
 

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
@@ -2505,7 +2505,7 @@
           }
         },
         "ports": {
-          "description": "Ports used by Vineyard component. For Master, the default client port is 2379 and peer port is 2380. For Worker, the default rpc port is 9600 and the default exporter port is 9144.",
+          "description": "Ports used by Vineyard component. For Master, the default client port is 2379 and peer port is 2380. For Worker, the default rpc port is 9600.",
           "type": "object",
           "additionalProperties": {
             "type": "integer",
@@ -3614,7 +3614,7 @@
           }
         },
         "ports": {
-          "description": "Ports used by Vineyard component. For Master, the default client port is 2379 and peer port is 2380. For Worker, the default rpc port is 9600 and the default exporter port is 9144.",
+          "description": "Ports used by Vineyard component. For Master, the default client port is 2379 and peer port is 2380. For Worker, the default rpc port is 9600.",
           "type": "object",
           "additionalProperties": {
             "type": "integer",
@@ -3743,7 +3743,7 @@
           "type": "string"
         },
         "image": {
-          "description": "Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-fluid-fuse`",
+          "description": "Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-mount-socket`",
           "type": "string"
         },
         "imagePullPolicy": {

diff --git a/api/v1alpha1/vineyardruntime_types.go b/api/v1alpha1/vineyardruntime_types.go
@@ -54,7 +54,7 @@ type VineyardCompTemplateSpec struct {
 
 	// Ports used by Vineyard component.
 	// For Master, the default client port is 2379 and peer port is 2380.
-	// For Worker, the default rpc port is 9600 and the default exporter port is 9144.
+	// For Worker, the default rpc port is 9600.
 	// +optional
 	Ports map[string]int `json:"ports,omitempty"`
 
@@ -142,7 +142,7 @@ type MasterSpec struct {
 // VineyardSockSpec holds the configurations for vineyard client socket
 type VineyardSockSpec struct {
 	// Image for Vineyard Fuse
-	// Default is `vineyardcloudnative/vineyard-fluid-fuse`
+	// Default is `vineyardcloudnative/vineyard-mount-socket`
 	// +optional
 	Image string `json:"image,omitempty"`
 
@@ -269,12 +269,3 @@ type VineyardRuntimeList struct {
 func init() {
 	SchemeBuilder.Register(&VineyardRuntime{}, &VineyardRuntimeList{})
 }
-
-// Replicas gets the replicas of runtime worker
-func (runtime *VineyardRuntime) Replicas() int32 {
-	return runtime.Spec.Worker.Replicas
-}
-
-func (runtime *VineyardRuntime) GetStatus() *RuntimeStatus {
-	return &runtime.Status
-}
diff --git a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
@@ -101,7 +101,7 @@ spec:
                       runtime is deleted Defaults to OnRuntimeDeleted'
                     type: string
                   image:
-                    description: Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-fluid-fuse`
+                    description: Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-mount-socket`
                     type: string
                   imagePullPolicy:
                     description: Image pull policy for Vineyard Fuse Default is `IfNotPresent`
@@ -234,8 +234,7 @@ spec:
                       type: integer
                     description: Ports used by Vineyard component. For Master, the
                       default client port is 2379 and peer port is 2380. For Worker,
-                      the default rpc port is 9600 and the default exporter port is
-                      9144.
+                      the default rpc port is 9600.
                     type: object
                   replicas:
                     description: The replicas of Vineyard component. If not specified,
@@ -3517,8 +3516,7 @@ spec:
                       type: integer
                     description: Ports used by Vineyard component. For Master, the
                       default client port is 2379 and peer port is 2380. For Worker,
-                      the default rpc port is 9600 and the default exporter port is
-                      9144.
+                      the default rpc port is 9600.
                     type: object
                   replicas:
                     description: The replicas of Vineyard component. If not specified,

diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -146,7 +146,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/vineyardruntime-controller:v1.0.0-7221cf3
+      image: fluidcloudnative/vineyardruntime-controller:v1.0.0-edc69cf
       imagePullPolicy: Always
 
 webhook:

diff --git a/charts/vineyard/Chart.yaml b/charts/vineyard/Chart.yaml
@@ -1,5 +1,6 @@
 apiVersion: v1
-version: 0.19.3
+appVersion: 0.18.2
+version: 0.18.2
 description: an In-Memory Data Manager for Data-Intensive Analytics
 home: https://v6d.io/
 keywords:

diff --git a/charts/vineyard/templates/_helpers.tpl b/charts/vineyard/templates/_helpers.tpl
@@ -159,41 +159,26 @@ resources:
     {{- end }}
 {{- end -}}
 
-
-{{/*
-Generate etcd endpoints for peer or client
-*/}}
-{{- define "vineyard.etcdEndpoints" -}}
-  {{- $replicas := int .Values.master.replicas }}
-  {{- $fullName := include "vineyard.fullname" . }}
-  {{- $etcdFullname := (printf "%s-%s" $fullName "master") }}
-  {{- $releaseNamespace := .Release.Namespace }}
-  {{- $etcdServiceName := (printf "%s-%s" $fullName "master-svc") }}
-  {{- $etcdEndpoint := list }}
-  {{- $portType := .portType }}
-  {{- $port := 0 }}
-  {{- if eq $portType "peer" }}
-    {{- $port = int .Values.master.ports.peer }}
-    {{- range $e, $i := until $replicas }}
-      {{- $etcdEndpoint = append $etcdEndpoint (printf "%s-%d=http://%s-%d.%s.%s:%d" $etcdFullname $i $etcdFullname $i $etcdServiceName $releaseNamespace $port) }}
-    {{- end }}
-  {{- else if eq $portType "client" }}
-    {{- $port = int .Values.master.ports.client }}
-    {{- range $e, $i := until $replicas }}
-      {{- $etcdEndpoint = append $etcdEndpoint (printf "http://%s-%d.%s.%s:%d" $etcdFullname $i $etcdServiceName $releaseNamespace $port) }}
-    {{- end }}
-  {{- end }}
-  {{- join "," $etcdEndpoint }}
-{{- end }}
-
 {{/*
 Get the master endpoint.
 */}}
 {{- define "vineyard.master.endpoint" -}}
     {{- if .Values.worker.externalEndpoint -}}
         {{- printf "http://%s" .Values.worker.externalEndpoint.uri }}
     {{- else -}}
-      {{ include "vineyard.etcdEndpoints" (dict "Values" .Values "Release" .Release "portType" "client") }}
+      {{- $replicas := int .Values.master.replicas }}
+      {{- $clientPort := int .Values.master.ports.client }}
+      {{- $name := include "vineyard.name" . }}
+      {{- $fullName := include "vineyard.fullname" . }}
+      {{- $etcdFullname := (printf "%s-%s" $fullName "master") }}
+      {{- $chart := include "vineyard.chart" . }}
+      {{- $releaseNamespace := .Release.Namespace }}
+      {{- $etcdServiceName := (printf "%s-%s" $fullName "master-svc") }}
+      {{- $etcdEndpoint := list }}
+      {{- range $e, $i := until $replicas }}
+      {{- $etcdEndpoint = append $etcdEndpoint (printf "http://%s-%d.%s.%s.svc.cluster.local:%d" $etcdFullname $i $etcdServiceName $releaseNamespace $clientPort) }}
+      {{- end }}
+      {{- join "," $etcdEndpoint }}
     {{- end -}}
 {{- end -}}
 
@@ -311,7 +296,6 @@ Get spill volume from tieredstore.
       {{- else }}
       - name: {{ $mediumName }}
         emptyDir:
-          medium: {{ eq .type "MEM" | ternary "Memory" "" }}
           {{- if .quota }}
           {{- /* quota should be transformed to match resource.Quantity. e.g. 20GB -> 20Gi */}}
           sizeLimit: {{ .quota | replace "B" "i" }}

diff --git a/charts/vineyard/templates/config/vineyard-rpc-conf.yaml b/charts/vineyard/templates/config/vineyard-rpc-conf.yaml
@@ -40,6 +40,6 @@ metadata:
 data:
   {{- $rpcEndpoints := list }}
   {{- range $e, $i := until $replicas }}
-  {{- $rpcEndpoints = append $rpcEndpoints (printf "%s-worker-%d.%s-worker-svc.%s:%d" $fullName $i $fullName $namespace $rpcPort) }}
+  {{- $rpcEndpoints = append $rpcEndpoints (printf "%s-worker-%d.%s-worker-svc.%s.svc.cluster.local:%d" $fullName $i $fullName $namespace $rpcPort) }}
   {{- end }}
   VINEYARD_RPC_ENDPOINT: {{ join "," $rpcEndpoints }}
diff --git a/charts/vineyard/templates/fuse/daemonset.yaml b/charts/vineyard/templates/fuse/daemonset.yaml
@@ -65,19 +65,19 @@ spec:
           securityContext:
             privileged: true
           env:
-          - name: MOUNT_DIR
-            value: {{ .Values.fuse.targetPath | dir }}
-          - name: FUSE_DIR
-            value: {{ .Values.fuse.targetPath }}
-          - name: RPC_CONF_DIR
-            value: {{ .Values.fuse.targetPath }}/rpc-conf
+          - name: MOUNT_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           - name: PRESTOP_MARKER
             value: /tmp/prestop-marker
+          - name: VINEYARD_FULL_NAME
+            value: {{ $fullName }}
           lifecycle:
             preStop:
               exec:
                 {{/* umount the configmap volume manually to avoid the error of "possibly malicious path detecte" */}}
-                command: ["sh", "-c", "touch /tmp/prestop-marker && umount {{ .Values.fuse.targetPath }} && umount {{ .Values.fuse.targetPath }}/rpc-conf"]
+                command: ["sh", "-c", "touch /tmp/prestop-marker && umount {{ .Values.fuse.targetPath }} && umount /runtime-mnt/vineyard/{{ .Release.Namespace }}/{{ $fullName }}/vineyard-fuse/rpc-conf"]
           {{- if .Values.master.resources  }}
 {{ include "vineyard.master.resources" . | indent 10 }}
           {{- end }}
@@ -86,7 +86,7 @@ spec:
             mountPath: {{ .Values.fuse.targetPath | dir }}
             mountPropagation: Bidirectional
           - name: vineyard-rpc-conf
-            mountPath: {{ .Values.fuse.targetPath }}/rpc-conf
+            mountPath: /runtime-mnt/vineyard/{{ .Release.Namespace }}/{{ $fullName }}/vineyard-fuse/rpc-conf
       restartPolicy: Always
       volumes:
         - name: vineyard-fuse-mount

diff --git a/charts/vineyard/templates/master/statefulset.yaml b/charts/vineyard/templates/master/statefulset.yaml
@@ -17,7 +17,9 @@
 {{- $peerPort := int .Values.master.ports.peer }}
 {{- $name := include "vineyard.name" . }}
 {{- $fullName := include "vineyard.fullname" . }}
+{{- $etcdFullname := (printf "%s-%s" $fullName "master") }}
 {{- $chart := include "vineyard.chart" . }}
+{{- $releaseNamespace := .Release.Namespace }}
 {{- $etcdServiceName := (printf "%s-%s" $fullName "master-svc") }}
 
 {{- if not .Values.master.externalEndpoint }}
@@ -76,13 +78,17 @@ spec:
           command:
             - etcd
             - --name=$(POD_NAME)
-            - --initial-advertise-peer-urls=http://$(POD_NAME).{{ $etcdServiceName }}.{{ .Release.Namespace }}:{{ $peerPort }}
+            - --initial-advertise-peer-urls=http://$(POD_NAME).{{ $etcdServiceName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ $peerPort }}
             - --listen-peer-urls=http://0.0.0.0:{{ $peerPort }}
-            - --advertise-client-urls=http://$(POD_NAME).{{ $etcdServiceName }}.{{ .Release.Namespace }}:{{ $clientPort }}
+            - --advertise-client-urls=http://$(POD_NAME).{{ $etcdServiceName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ $clientPort }}
             - --listen-client-urls=http://0.0.0.0:{{ $clientPort }}
-            - --initial-cluster-token={{ .Release.Name }}
+            - --initial-cluster-token=my-etcd-cluster
             - --initial-cluster-state=new
-            - --initial-cluster={{ include "vineyard.etcdEndpoints" (dict "Values" .Values "Release" .Release "portType" "peer") }}
+            {{- $initialCluster := list }}
+            {{- range $e, $i := until $replicas }}
+            {{- $initialCluster = append $initialCluster (printf "%s-%d=http://%s-%d.%s.%s.svc.cluster.local:%d" $etcdFullname $i $etcdFullname $i $etcdServiceName $releaseNamespace $peerPort) }}
+            {{- end }}
+            - --initial-cluster={{ join "," $initialCluster }}
             - --data-dir=/etcd-data
           env:
             - name: POD_NAME

diff --git a/charts/vineyard/templates/worker/service.yaml b/charts/vineyard/templates/worker/service.yaml
@@ -48,7 +48,3 @@ spec:
       port: {{ int .Values.worker.ports.rpc }}
       targetPort: {{ int .Values.worker.ports.rpc }}
       protocol: TCP
-    - name: metrics
-      port: {{ int .Values.worker.ports.exporter }}
-      targetPort: {{ int .Values.worker.ports.exporter }}
-      protocol: TCP
diff --git a/charts/vineyard/templates/worker/statefulset.yaml b/charts/vineyard/templates/worker/statefulset.yaml
@@ -91,11 +91,6 @@ spec:
             - --spill_upper_rate
             - "{{ include "vineyard.spill.upperRate" . }}"
             {{- end }}
-            {{- if not .Values.disablePrometheus }}
-            - --metrics
-            - --log_dir
-            - /var/log/vineyard
-            {{- end }}
           env:
           - name: VINEYARDD_NAME
             value: {{ template "vineyard.fullname" . }}-vineyardd
@@ -155,25 +150,9 @@ spec:
           volumeMounts:
           - name: vineyard-socket-volume
             mountPath: /var/run/vineyard
-          {{- if not .Values.disablePrometheus }}
-          - name: log
-            mountPath: /var/log/vineyard
-          {{- end }}
           {{- if eq (include "vineyard.checkTieredStore" .) "true" }}
 {{- include "vineyard.worker.tieredstoreVolumeMounts" . }}
           {{- end }}
-        {{- if not .Values.disablePrometheus }}
-        - name: metrics
-          image: vineyardcloudnative/vineyardd-grok-exporter
-          imagePullPolicy: {{ .Values.worker.imagePullPolicy }}
-          ports:
-          - name: exporter
-            containerPort: {{ int .Values.worker.ports.exporter }}
-            protocol: TCP
-          volumeMounts:
-          - name: log
-            mountPath: /var/log/vineyard
-          {{- end }}
       volumes:
       {{- if eq (include "vineyard.checkTieredStore" .) "true" }}
 {{- include "vineyard.worker.tieredstoreVolume" . }}
@@ -182,10 +161,6 @@ spec:
         hostPath:
           path: /runtime-mnt/vineyard/{{ .Release.Namespace }}/{{ $fullName }}
           type: DirectoryOrCreate
-      {{- if not .Values.disablePrometheus }}
-      - name: log
-        emptyDir: {}
-      {{- end }}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution: