Fix issue for jindo (fluid-cloudnative#1056)

* Add mountPropagation for registrar, To #36711652 Signed-off-by: cheyang <cheyang@163.com> * Add mountPropagation for registrar, To #36711652 Signed-off-by: cheyang <cheyang@163.com> * Add mountPropagation for registrar, To #36711652 Signed-off-by: cheyang <cheyang@163.com> * update runtime test, To #36006921 Signed-off-by: cheyang <cheyang@163.com> * update runtime test, To #36006921 Signed-off-by: cheyang <cheyang@163.com> * update runtime test, To #36006921 Signed-off-by: cheyang <cheyang@163.com> * update runtime test, To #36006921 Signed-off-by: cheyang <cheyang@163.com>
Isla-top · Nov 3, 2021 · c0754f7 · c0754f7
1 parent cf8b24d
commit c0754f7
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -165,7 +165,7 @@ docker-push-init-users: docker-build-init-users
 docker-push-webhook: docker-build-webhook
 	docker push ${WEBHOOK_IMG}:${GIT_VERSION}
 
-docker-build-all: docker-build-dataset-controller docker-build-alluxioruntime-controller docker-build-jindoruntime-controller docker-build-goosefsruntime-controller docker-build-csi docker-build-init-users fluid-build-webhook docker-build-goosefsruntime-controller
+docker-build-all: docker-build-dataset-controller docker-build-alluxioruntime-controller docker-build-jindoruntime-controller docker-build-goosefsruntime-controller docker-build-csi docker-build-init-users docker-build-webhook docker-build-goosefsruntime-controller
 docker-push-all: docker-push-dataset-controller docker-push-alluxioruntime-controller docker-push-jindoruntime-controller docker-push-jindoruntime-controller docker-push-csi docker-push-init-users docker-push-webhook docker-push-goosefsruntime-controller
 
 # find or download controller-gen

diff --git a/charts/fluid/fluid/CHANGELOG.md b/charts/fluid/fluid/CHANGELOG.md
@@ -36,3 +36,7 @@
 * High Availability
 * Update mountPoint dynamically in runtime
 * Add GooseFSRuntime
+
+### 0.7.0
+
+* Add mountPropagation for registrar
diff --git a/charts/fluid/fluid/Chart.yaml b/charts/fluid/fluid/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.7.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.7.0-d4ceed7
+appVersion: 0.7.0-2c224b9
 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,15 +6,15 @@ workdir: /tmp
 
 dataset:
   controller:
-    image: fluidcloudnative/dataset-controller:v0.7.0-d4ceed7
+    image: fluidcloudnative/dataset-controller:v0.7.0-2c224b9
 
 csi:
   config:
     hostNetwork: false
   registrar:
     image: registry.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v0.7.0-d4ceed7
+    image: fluidcloudnative/fluid-csi:v0.7.0-2c224b9
   kubelet:
     rootDir: /var/lib/kubelet
 
@@ -26,9 +26,9 @@ runtime:
     portRange: 20000-26000
     enabled: true
     init:
-      image: fluidcloudnative/init-users:v0.7.0-d4ceed7
+      image: fluidcloudnative/init-users:v0.7.0-2c224b9
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v0.7.0-d4ceed7
+      image: fluidcloudnative/alluxioruntime-controller:v0.7.0-2c224b9
     runtime:
       image: registry.aliyuncs.com/alluxio/alluxio:release-2.5.0-2-SNAPSHOT-52ad95c
     fuse:
@@ -42,25 +42,25 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:3.7.0
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v0.7.0-d4ceed7
+      image: fluidcloudnative/jindoruntime-controller:v0.7.0-2c224b9
     init:
       portCheck:
         enabled: false
-      image: fluidcloudnative/init-users:v0.7.0-d4ceed7
+      image: fluidcloudnative/init-users:v0.7.0-2c224b9
   goosefs:
     runtimeWorkers: 3
     portRange: 26000-32000
     enabled: false 
     init:
-      image: fluidcloudnative/init-users:v0.7.0-d4ceed7
+      image: fluidcloudnative/init-users:v0.7.0-2c224b9
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v0.7.0-d4ceed7
+      image: fluidcloudnative/goosefsruntime-controller:v0.7.0-2c224b9
     runtime:
       image: ccr.ccs.tencentyun.com/goosefs/goosefs:v1.0.1
     fuse:
       image: ccr.ccs.tencentyun.com/goosefs/goosefs-fuse:v1.0.1
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v0.7.0-d4ceed7
+  image: fluidcloudnative/fluid-webhook:v0.7.0-2c224b9
 
diff --git a/pkg/ddc/jindo/health_check_test.go b/pkg/ddc/jindo/health_check_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 )
 
-func TestCheckRuntimeHealthy(t *testing.T){
+func TestCheckRuntimeHealthy(t *testing.T) {
 	engine := &JindoEngine{}
 	err := engine.CheckRuntimeHealthy()
-	if err != nil{
-		t.Errorf("check runtime healthy failed,err:%s",err.Error())
+	if err != nil {
+		t.Errorf("check runtime healthy failed,err:%s", err.Error())
 	}
-}
+}
diff --git a/pkg/ddc/jindo/worker.go b/pkg/ddc/jindo/worker.go
@@ -292,7 +292,7 @@ func (e *JindoEngine) buildWorkersAffinity(workers *v1.StatefulSet) (workersToUp
 		workersToUpdate.Spec.Template.Spec.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution =
 			append(workersToUpdate.Spec.Template.Spec.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution,
 				corev1.PreferredSchedulingTerm{
-					Weight: 200,
+					Weight: 100,
 					Preference: corev1.NodeSelectorTerm{
 						MatchExpressions: []corev1.NodeSelectorRequirement{
 							{

diff --git a/pkg/ddc/jindo/worker_test.go b/pkg/ddc/jindo/worker_test.go
@@ -529,7 +529,7 @@ func TestBuildWorkersAffinity(t *testing.T) {
 					NodeAffinity: &v1.NodeAffinity{
 						PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
 							{
-								Weight: 200,
+								Weight: 100,
 								Preference: v1.NodeSelectorTerm{
 									MatchExpressions: []v1.NodeSelectorRequirement{
 										{
@@ -601,7 +601,7 @@ func TestBuildWorkersAffinity(t *testing.T) {
 					NodeAffinity: &v1.NodeAffinity{
 						PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
 							{
-								Weight: 200,
+								Weight: 100,
 								Preference: v1.NodeSelectorTerm{
 									MatchExpressions: []v1.NodeSelectorRequirement{
 										{
@@ -682,7 +682,7 @@ func TestBuildWorkersAffinity(t *testing.T) {
 						},
 						PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{
 							{
-								Weight: 200,
+								Weight: 100,
 								Preference: v1.NodeSelectorTerm{
 									MatchExpressions: []v1.NodeSelectorRequirement{
 										{
@@ -723,7 +723,7 @@ func TestBuildWorkersAffinity(t *testing.T) {
 			}
 
 			if !reflect.DeepEqual(worker.Spec.Template.Spec.Affinity, want) {
-				t.Errorf("JindoEngine.buildWorkersAffinity() = %v, want %v", tt.fields.worker.Spec.Template.Spec.Affinity, tt.fields.want)
+				t.Errorf("Test case %s JindoEngine.buildWorkersAffinity() = %v, want %v", tt.name, worker.Spec.Template.Spec.Affinity, tt.fields.want)
 			}
 		})
 	}

diff --git a/pkg/webhook/certificate_builder_test.go b/pkg/webhook/certificate_builder_test.go
@@ -32,7 +32,7 @@ import (
 
 var (
 	testScheme *runtime.Scheme
-	log = ctrl.Log.WithName("test")
+	log        = ctrl.Log.WithName("test")
 )
 
 func init() {
@@ -61,8 +61,8 @@ func TestBuildAndSyncCABundle(t *testing.T) {
 	var webhookName = "webhookName"
 	var caBundles = [][]byte{
 		{3, 5, 54, 34},
-		{3, 8 ,54, 4},
-		{35, 5 ,54, 4},
+		{3, 8, 54, 4},
+		{35, 5, 54, 4},
 	}
 	var testMutatingWebhookConfiguration = &v1beta1.MutatingWebhookConfiguration{
 		ObjectMeta: metav1.ObjectMeta{
@@ -191,7 +191,7 @@ func TestGenCA(t *testing.T) {
 func TestPatchCABundle(t *testing.T) {
 	var webhookName = "webhookName"
 	testCases := map[string]struct {
-		ca          []byte
+		ca []byte
 	}{
 		"test case 1": {
 			ca: []byte{1, 2, 3},
@@ -212,19 +212,19 @@ func TestPatchCABundle(t *testing.T) {
 			{
 				Name: "webhook1",
 				ClientConfig: v1beta1.WebhookClientConfig{
-					CABundle: []byte{3, 5 ,54, 34},
+					CABundle: []byte{3, 5, 54, 34},
 				},
 			},
 			{
 				Name: "webhook2",
 				ClientConfig: v1beta1.WebhookClientConfig{
-					CABundle: []byte{3, 8 ,54, 4},
+					CABundle: []byte{3, 8, 54, 4},
 				},
 			},
 			{
 				Name: "webhook3",
 				ClientConfig: v1beta1.WebhookClientConfig{
-					CABundle: []byte{35, 5 ,54, 4},
+					CABundle: []byte{35, 5, 54, 4},
 				},
 			},
 		},