Refactor runtime Implementation (fluid-cloudnative#273)

* Rename pkg name, To #30961382 * Refactor helm chart, To #30961382 * Refactor helm chart, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382 * Lint the source code, To #30961382
PlutoEr-001 · Oct 27, 2020 · 81ea9b0 · 81ea9b0
1 parent f731526
commit 81ea9b0
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 108 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,7 +19,8 @@ jobs:
           command: |
             test -z "$(go fmt ./... 2>/dev/null | tee /dev/stderr)" || (echo "please format Go code with 'gofmt'")
             go vet ./...
-      - run: docker build . -t fluid:${CIRCLE_BUILD_NUM}
+      - run: docker build . -f Dockerfile.dataset dataset-controller:${CIRCLE_BUILD_NUM}
+      - run: docker build . -f Dockerfile.alluxioruntime alluxioruntime-controller:${CIRCLE_BUILD_NUM}
       - run: docker build . -f Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM}
 
 # maybe later we need to upload output to helm repository
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,8 @@ matrix:
         - sudo mv /tmp/kubebuilder_2.3.1_linux_${arch} /usr/local/kubebuilder
         - export PATH=$PATH:/usr/local/kubebuilder/bin
       script:
-        - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -o bin/dataset-controller cmd/dataset_controller/main.go
-        - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -o bin/alluxioruntime-controller cmd/alluxioruntime_controller/main.go
+        - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -o bin/dataset-controller cmd/dataset/main.go
+        - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -o bin/alluxioruntime-controller cmd/alluxio/main.go
         - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -o bin/csi cmd/csi/main.go
         - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go vet ./...
         - golangci-lint run --timeout=10m ./...

diff --git a/Dockerfile.alluxioruntime b/Dockerfile.alluxioruntime
@@ -4,7 +4,8 @@ FROM golang:1.14.2 as builder
 WORKDIR /go/src/github.com/fluid-cloudnative/fluid
 COPY . .
 
-RUN make alluxioruntime-controller-build
+RUN make alluxioruntime-controller-build && \
+    cp bin/alluxioruntime-controller /go/bin/alluxioruntime-controller
 
 FROM alpine:3.10
 RUN apk add --update curl tzdata iproute2 bash libc6-compat vim &&  \

diff --git a/Dockerfile.csi b/Dockerfile.csi
@@ -7,7 +7,8 @@ COPY . .
 # Build
 # RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o csi main.go
 #RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -a -o /go/bin/fluid-csi cmd/csi/*.go
-RUN make csi-build
+RUN make csi-build && \
+    cp bin/fluid-csi /go/bin/fluid-csi
 
 # RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off go build -gcflags="-N -l" -a -o /go/bin/fluid-csi cmd/csi/*.go
 

diff --git a/Dockerfile.dataset b/Dockerfile.dataset
@@ -4,7 +4,8 @@ FROM golang:1.14.2 as builder
 WORKDIR /go/src/github.com/fluid-cloudnative/fluid
 COPY . .
 
-RUN make dataset-controller-build
+RUN make dataset-controller-build && \
+    cp bin/dataset-controller /go/bin/dataset-controller
 
 FROM alpine:3.10
 RUN apk add --update curl tzdata iproute2 bash libc6-compat vim &&  \

diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ override LDFLAGS += \
   -X ${PACKAGE}.gitTreeState=${GIT_TREE_STATE} \
   -extldflags "-static"
 
-all: manager
+all: build
 
 # Run tests
 test: generate fmt vet
@@ -47,23 +47,17 @@ test: generate fmt vet
 unit-test: generate fmt vet
 	GO111MODULE=off go list ./... | grep -v controller | xargs go test ${CI_TEST_FLAGS} ${LOCAL_FLAGS}
 
-# Build manager binary
-manager: generate fmt vet
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -o bin/manager cmd/controller/main.go
+# Build binary
+build: dataset-controller-build alluxioruntime-controller-build csi-build
 
-# Build CSI binary
-csi: generate fmt vet
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -o bin/csi -ldflags '${LDFLAGS}' cmd/csi/main.go
+csi-build: generate fmt vet
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -o bin/fluid-csi -ldflags '${LDFLAGS}' cmd/csi/main.go
 
-# Build binary in docker images, will be called in Dockerfile
-csi-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -o /go/bin/fluid-csi -ldflags '${LDFLAGS}' cmd/csi/main.go
+dataset-controller-build: generate fmt vet
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -gcflags="-N -l" -a -o bin/dataset-controller -ldflags '${LDFLAGS}' cmd/dataset/main.go
 
-dataset-controller-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -gcflags="-N -l" -a -o /go/bin/dataset-controller -ldflags '${LDFLAGS}' cmd/dataset_controller/main.go
-
-alluxioruntime-controller-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -gcflags="-N -l" -a -o /go/bin/alluxioruntime-controller -ldflags '${LDFLAGS}' cmd/alluxioruntime_controller/main.go
+alluxioruntime-controller-build: generate fmt vet
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=off  go build -gcflags="-N -l" -a -o bin/alluxioruntime-controller -ldflags '${LDFLAGS}' cmd/alluxio/main.go
 
 # Debug against the configured Kubernetes cluster in ~/.kube/config, add debug
 debug: generate fmt vet manifests

diff --git a/charts/fluid/fluid/CHANGELOG.md b/charts/fluid/fluid/CHANGELOG.md
@@ -19,3 +19,4 @@
 * Add debug info for csi
 * Make mount root configurable
 * Update HCFS URL
+* Split the controller into alluxio runtime and dataset
diff --git a/...es/manager/alluxioruntime_controller.yaml → ...controller/alluxioruntime_controller.yaml b/...es/manager/alluxioruntime_controller.yaml → ...controller/alluxioruntime_controller.yaml
@@ -3,34 +3,34 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: alluxioruntime-controller-manager
+  name: alluxioruntime-controller
   namespace: fluid-system
   labels:
-    control-plane: alluxioruntime-controller-manager
+    control-plane: alluxioruntime-controller
 spec:
   selector:
     matchLabels:
-      control-plane: alluxioruntime-controller-manager
+      control-plane: alluxioruntime-controller
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: alluxioruntime-controller-manager
+        control-plane: alluxioruntime-controller
     spec:
       serviceAccountName: alluxioruntime-controller
       tolerations:
       - operator: Exists
       hostNetwork: true
       containers:
-      - image: "{{ .Values.runtime.alluxio.image }}"
+      - image: "{{ .Values.runtime.alluxio.controller.image }}"
         name: manager
         command: ["alluxioruntime-controller", "start"]
         args:
           - --development=false
         env:
-          {{- if .Values.runtime.alluxio.initImage }}
+          {{- if .Values.runtime.alluxio.init.image }}
           - name: ALLUXIO_INIT_IMAGE_ENV
-            value: {{ .Values.runtime.alluxio.initImage | quote }}
+            value: {{ .Values.runtime.alluxio.init.image | quote }}
           {{- end }}
           {{- if .Values.runtime.mountRoot }}
           - name: MOUNT_ROOT

diff --git a/...templates/manager/dataset_controller.yaml → ...plates/controller/dataset_controller.yaml b/...templates/manager/dataset_controller.yaml → ...plates/controller/dataset_controller.yaml
@@ -2,25 +2,25 @@
 # kind: Namespace
 # metadata:
 #   labels:
-#     control-plane: controller-manager
+#     control-plane: controller
 #   name: fluid-system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: dataset-controller-manager
+  name: dataset-controller
   namespace: fluid-system
   labels:
-    control-plane: dataset-controller-manager
+    control-plane: dataset-controller
 spec:
   selector:
     matchLabels:
-      control-plane: dataset-controller-manager
+      control-plane: dataset-controller
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: dataset-controller-manager
+        control-plane: dataset-controller
     spec:
       serviceAccountName: dataset-controller
       tolerations:
@@ -33,9 +33,9 @@ spec:
         args:
           - --development=false
         env:
-          {{- if .Values.runtime.alluxio.initImage }}
+          {{- if .Values.runtime.alluxio.init.image }}
           - name: ALLUXIO_INIT_IMAGE_ENV
-            value: {{ .Values.runtime.alluxio.initImage | quote }}
+            value: {{ .Values.runtime.alluxio.init.image | quote }}
           {{- end }}
         ports:
         - containerPort: 8080

diff --git a/charts/fluid/fluid/templates/role/ClusterRoleBindind.yaml b/charts/fluid/fluid/templates/role/ClusterRoleBindind.yaml
diff --git a/charts/fluid/fluid/templates/role/ServiceAccount b/charts/fluid/fluid/templates/role/ServiceAccount
diff --git a/...ts/fluid/fluid/templates/role/ClusterRole → ...id/fluid/templates/role/alluxio/rbac.yaml b/...ts/fluid/fluid/templates/role/ClusterRole → ...id/fluid/templates/role/alluxio/rbac.yaml
@@ -1,27 +1,8 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: dataset-manager
-rules:
-  - apiGroups:
-      - data.fluid.io
-    resources:
-      - datasets
-      - datasets/status
-    verbs:
-      - '*'
-  - apiGroups:
-      - ""
-    resources:
-      - events
-    verbs:
-      - '*'
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: alluxioruntime-manager
+  name: alluxioruntime-controller
 rules:
   - apiGroups:
       - ""
@@ -58,4 +39,23 @@ rules:
       - daemonsets/status
       - statefulsets/status
     verbs:
-      - '*'
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: alluxioruntime-clusterrolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: alluxioruntime-controller
+subjects:
+  - kind: ServiceAccount
+    name: alluxioruntime-controller
+    namespace: fluid-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: alluxioruntime-controller
+  namespace: fluid-system
diff --git a/charts/fluid/fluid/templates/role/dataset/rbac.yaml b/charts/fluid/fluid/templates/role/dataset/rbac.yaml
@@ -0,0 +1,38 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: dataset-controller
+rules:
+  - apiGroups:
+      - data.fluid.io
+    resources:
+      - datasets
+      - datasets/status
+    verbs:
+      - '*'
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: dataset-clusterrolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: dataset-controller
+subjects:
+- kind: ServiceAccount
+  name: dataset-controller
+  namespace: fluid-system
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: dataset-controller
+  namespace: fluid-system
diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -4,16 +4,18 @@
 
 dataset:
   controller:
-    image: registry.cn-hangzhou.aliyuncs.com/qiulingwei/dataset-controller:v0.4.0-f2c3a3f
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/dataset-controller:v0.4.0-7aec4d3
 
 csi:
   registrar:
     image: registry.cn-hangzhou.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.4.0-a8ba7c9
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.4.0-7aec4d3
 
 runtime:
   mountRoot: /alluxio-mnt
   alluxio:
-    initImage: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.4.0-a8ba7c9
-    image: registry.cn-hangzhou.aliyuncs.com/qiulingwei/alluxioruntime-controller:v0.4.0-f2c3a3f
+    init:
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.4.0-a8ba7c9
+    controller:
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/alluxioruntime-controller:v0.4.0-7aec4d3
diff --git a/cmd/alluxioruntime_controller/main.go → cmd/alluxio/main.go b/cmd/alluxioruntime_controller/main.go → cmd/alluxio/main.go
@@ -43,13 +43,12 @@ var (
 	// Use compiler to check if the struct implements all the interface
 	_ base.Implement = (*alluxio.AlluxioEngine)(nil)
 
-	short    bool
+	short                bool
 	metricsAddr          string
 	enableLeaderElection bool
 	development          bool
 )
 
-
 var cmd = &cobra.Command{
 	Use:   "alluxioruntime-controller",
 	Short: "Controller for alluxioruntime",
@@ -112,7 +111,7 @@ func handle() {
 		MetricsBindAddress: metricsAddr,
 		LeaderElection:     enableLeaderElection,
 		LeaderElectionID:   "7857424864.data.fluid.io",
-		Port: 9443,
+		Port:               9443,
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start alluxioruntime manager")
@@ -142,4 +141,3 @@ func handle() {
 		os.Exit(1)
 	}
 }
-
diff --git a/cmd/dataset_controller/main.go → cmd/dataset/main.go b/cmd/dataset_controller/main.go → cmd/dataset/main.go
@@ -41,13 +41,12 @@ var (
 	// Use compiler to check if the struct implements all the interface
 	_ base.Implement = (*alluxio.AlluxioEngine)(nil)
 
-	short    bool
+	short                bool
 	metricsAddr          string
 	enableLeaderElection bool
 	development          bool
 )
 
-
 var cmd = &cobra.Command{
 	Use:   "dataset-controller",
 	Short: "controller for dataset",
@@ -111,7 +110,7 @@ func handle() {
 		MetricsBindAddress: metricsAddr,
 		LeaderElection:     enableLeaderElection,
 		LeaderElectionID:   "89759796.data.fluid.io",
-		Port: 9443,
+		Port:               9443,
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start dataset manager")