Build docker image for fluid app controller (#1516)

* Add samples, To #40056722 Signed-off-by: cheyang <[email protected]> * Add samples, To #40056722 Signed-off-by: cheyang <[email protected]> * Update dockerfile, To #40056722 Signed-off-by: cheyang <[email protected]> * Update dockerfile, To #40056722 Signed-off-by: cheyang <[email protected]> * Build docker image for env in csi plugin, To #37688693 Signed-off-by: cheyang <[email protected]>
fluid-cloudnative · Mar 14, 2022 · 56f2d9e · 56f2d9e
1 parent 7995787
commit 56f2d9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ CRD_OPTIONS ?= "crd"
 # IMG_REPO ?= registry.aliyuncs.com/fluid
 IMG_REPO ?= fluidcloudnative
 DATASET_CONTROLLER_IMG ?= ${IMG_REPO}/dataset-controller
-fluid-app_CONTROLLER_IMG ?= ${IMG_REPO}/fluid-app-controller
+APPLICATION_CONTROLLER_IMG ?= ${IMG_REPO}/application-controller
 ALLUXIORUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/alluxioruntime-controller
 JINDORUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/jindoruntime-controller
 GOOSEFSRUNTIME_CONTROLLER_IMG ?= ${IMG_REPO}/goosefsruntime-controller
@@ -36,7 +36,7 @@ PACKAGE=github.com/fluid-cloudnative/fluid
 
 # Build binaries
 BINARY_BUILD := dataset-controller-build
-BINARY_BUILD += fluid-app-controller-build
+BINARY_BUILD += application-controller-build
 BINARY_BUILD += alluxioruntime-controller-build
 BINARY_BUILD += jindoruntime-controller-build
 BINARY_BUILD += juicefsruntime-controller-build
@@ -45,7 +45,7 @@ BINARY_BUILD += webhook-build
 
 # Build docker images
 DOCKER_BUILD := docker-build-dataset-controller
-DOCKER_BUILD += docker-build-fluid-app-controller
+DOCKER_BUILD += docker-build-application-controller
 DOCKER_BUILD += docker-build-alluxioruntime-controller
 DOCKER_BUILD += docker-build-jindoruntime-controller
 DOCKER_BUILD += docker-build-goosefsruntime-controller
@@ -56,7 +56,7 @@ DOCKER_BUILD += docker-build-init-users
 
 # Push docker images
 DOCKER_PUSH := docker-push-dataset-controller
-DOCKER_PUSH += docker-push-fluid-app-controller
+DOCKER_PUSH += docker-push-application-controller
 DOCKER_PUSH += docker-push-alluxioruntime-controller
 DOCKER_PUSH += docker-push-jindoruntime-controller
 DOCKER_PUSH += docker-push-csi
@@ -108,8 +108,8 @@ juicefsruntime-controller-build: generate fmt vet
 webhook-build: generate fmt vet
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build -gcflags="-N -l" -a -o bin/fluid-webhook -ldflags '${LDFLAGS}' cmd/webhook/main.go
 
-fluid-app-controller-build: generate fmt vet
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build -gcflags="-N -l" -a -o bin/fluid-app-controller -ldflags '${LDFLAGS}' cmd/fluidapp/main.go
+application-controller-build: generate fmt vet
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=${GO_MODULE}  go build -gcflags="-N -l" -a -o bin/fluidapp-controller -ldflags '${LDFLAGS}' cmd/fluidapp/main.go
 
 # Debug against the configured Kubernetes cluster in ~/.kube/config, add debug
 debug: generate fmt vet manifests
@@ -159,8 +159,8 @@ update-api-doc:
 docker-build-dataset-controller: generate fmt vet
 	docker build --no-cache . -f docker/Dockerfile.dataset -t ${DATASET_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-build-fluid-app-controller: generate fmt vet
-	docker build --no-cache . -f docker/Dockerfile.fluid-app -t ${fluid-app_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 --no-cache . -f docker/Dockerfile.alluxioruntime -t ${ALLUXIORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}
@@ -190,8 +190,8 @@ docker-build-webhook:
 docker-push-dataset-controller: docker-build-dataset-controller
 	docker push ${DATASET_CONTROLLER_IMG}:${GIT_VERSION}
 
-docker-push-fluid-app-controller: docker-build-fluid-app-controller
-	docker push ${fluid-app_CONTROLLER_IMG}:${GIT_VERSION}
+docker-push-application-controller: docker-build-application-controller
+	docker push ${APPLICATION_CONTROLLER_IMG}:${GIT_VERSION}
 
 docker-push-alluxioruntime-controller: docker-build-alluxioruntime-controller
 	docker push ${ALLUXIORUNTIME_CONTROLLER_IMG}:${GIT_VERSION}

diff --git a/charts/fluid/fluid/CHANGELOG.md b/charts/fluid/fluid/CHANGELOG.md
@@ -42,3 +42,7 @@
 * Add mountPropagation for registrar
 * Add syncRetryDuration
 * Add auto fuse recovery
+
+### 0.8.0
+
+* Add application controller component
diff --git a/charts/fluid/fluid/Chart.yaml b/charts/fluid/fluid/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.8.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.
-appVersion: 0.8.0-da5d3a2
+appVersion: 0.8.0-44d032f
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -6,7 +6,7 @@ workdir: /tmp
 
 dataset:
   controller:
-    image: fluidcloudnative/dataset-controller:v0.8.0-da5d3a2
+    image: fluidcloudnative/dataset-controller:v0.8.0-44d032f
 
 csi:
   featureGates: "FuseRecovery=false"
@@ -15,7 +15,7 @@ csi:
   registrar:
     image: registry.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v0.8.0-da5d3a2
+    image: fluidcloudnative/fluid-csi:v0.8.0-44d032f
   kubelet:
     rootDir: /var/lib/kubelet
 
@@ -28,9 +28,9 @@ runtime:
     portRange: 20000-26000
     enabled: true
     init:
-      image: fluidcloudnative/init-users:v0.8.0-da5d3a2
+      image: fluidcloudnative/init-users:v0.8.0-44d032f
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v0.8.0-da5d3a2
+      image: fluidcloudnative/alluxioruntime-controller:v0.8.0-44d032f
     runtime:
       image: registry.aliyuncs.com/alluxio/alluxio:release-2.7.2-SNAPSHOT-3714f2b
     fuse:
@@ -44,33 +44,33 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:3.8.0
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v0.8.0-da5d3a2
+      image: fluidcloudnative/jindoruntime-controller:v0.8.0-44d032f
     init:
       portCheck:
         enabled: false
-      image: fluidcloudnative/init-users:v0.8.0-da5d3a2
+      image: fluidcloudnative/init-users:v0.8.0-44d032f
   goosefs:
     runtimeWorkers: 3
     portRange: 26000-32000
     enabled: false
     init:
-      image: fluidcloudnative/init-users:v0.8.0-da5d3a2
+      image: fluidcloudnative/init-users:v0.8.0-44d032f
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v0.8.0-da5d3a2
+      image: fluidcloudnative/goosefsruntime-controller:v0.8.0-44d032f
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs-fuse:v1.2.0
   juicefs:
     enabled: false
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v0.8.0-da5d3a2
+      image: fluidcloudnative/juicefsruntime-controller:v0.8.0-44d032f
     fuse:
       image: juicedata/juicefs-csi-driver:v0.11.0
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v0.8.0-da5d3a2
+  image: fluidcloudnative/fluid-webhook:v0.8.0-44d032f
   replicas: 1
 
 fluidapp:

diff --git a/docker/Dockerfile.fluidapp → docker/Dockerfile.application b/docker/Dockerfile.fluidapp → docker/Dockerfile.application
@@ -4,7 +4,7 @@ FROM golang:1.16.8 as builder
 WORKDIR /go/src/github.com/fluid-cloudnative/fluid
 COPY . .
 
-RUN make fluid-app-controller-build && \
+RUN make application-controller-build && \
     cp bin/fluidapp-controller /go/bin/fluidapp-controller
 
 # Debug