diff --git a/Makefile b/Makefile index abc6e9c9f66..a33d9811697 100644 --- 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 index 42d22d325c9..55ba0a19492 100644 --- 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 index 4875582d309..da894b02764 100644 --- 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 index 61dceb3d899..9a53774ec77 100644 --- 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.7.0-d4ceed7 + image: fluidcloudnative/dataset-controller:v0.7.0-2c224b9 csi: config: @@ -14,7 +14,7 @@ csi: 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,19 +42,19 @@ 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: @@ -62,5 +62,5 @@ runtime: 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 index a6100ff1890..949a5a8880f 100644 --- 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()) } -} \ No newline at end of file +} diff --git a/pkg/ddc/jindo/worker.go b/pkg/ddc/jindo/worker.go index 0d17b03ad74..6d943faa0df 100644 --- 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 index 260165fcebb..c2f77ebdad7 100644 --- 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 index 37828d2ae2c..bea1e22e178 100644 --- 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}, }, }, },