Merge remote-tracking branch 'upstream/master' into alluxio-container…

…-network
fluid-cloudnative · May 21, 2022 · 5600d8b · 5600d8b
2 parents da650e1 + 00220ae
commit 5600d8b
Show file tree

Hide file tree

Showing 23 changed files with 7,841 additions and 245 deletions.
diff --git a/charts/alluxio/values.yaml b/charts/alluxio/values.yaml
@@ -12,6 +12,7 @@
 # This should not be modified in the usual case.
 fullnameOverride: alluxio
 
+
 ## Common ##
 
 # Docker Image
@@ -21,7 +22,7 @@ imagePullPolicy: IfNotPresent
 
 # Create User Docker Image // TODO make it configurable
 initUsers:
-  enabled: false
+  enabled: false 
   image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users
   imageTag: v0.3.0-1467caa
   imagePullPolicy: IfNotPresent
@@ -86,11 +87,11 @@ master:
   resources:
     # The default xmx is 8G
     limits:
-    #      cpu: "4"
-    #      memory: "8G"
+#      cpu: "4"
+#      memory: "8G"
     requests:
-  #      cpu: "1"
-  #      memory: "1G"
+#      cpu: "1"
+#      memory: "1G"
   ports:
     embedded: 19200
     rpc: 19998
@@ -131,11 +132,11 @@ jobMaster:
   properties:
   resources:
     limits:
-    #      cpu: "4"
-    #      memory: "8G"
+#      cpu: "4"
+#      memory: "8G"
     requests:
-  #      cpu: "1"
-  #      memory: "1G"
+#      cpu: "1"
+#      memory: "1G"
   ports:
     embedded: 20003
     rpc: 20001
@@ -155,8 +156,8 @@ jobMaster:
 journal:
   # Setting journal type, "UFS" or "EMBEDDED"
   # In commit 2c125dee25f8d4566ae23646a999c16c530ffbc9, in order to support master raft embeeded journal mode, change default value from UFS to EMBEDDED
-  # TODO (@xieydd), will support journalClaimTemplates configure the journal setting
-  type: "EMBEDDED"
+  # TODO (@xieydd), will support journalClaimTemplates configure the journal setting   
+  type: "EMBEDDED" 
   ufsType: "local" # Ignored if type is "EMBEDDED". "local" or "HDFS"
   folder: "/journal" # Master journal folder
   # volumeType controls the type of journal volume.
@@ -180,14 +181,15 @@ apiGateway:
   properties:
   resources:
     limits:
-    #      cpu: "4"
-    #      memory: "4G"
+#      cpu: "4"
+#      memory: "4G"
     requests:
-  #      cpu: "1"
-  #      memory: "2G"
+#      cpu: "1"
+#      memory: "2G"
   ports:
     rest: 39999
 
+
 # You can enable metastore to use ROCKS DB instead of Heap
 # metastore:
 #   volumeType: persistentVolumeClaim # Options: "persistentVolumeClaim" or "emptyDir"
@@ -200,25 +202,26 @@ apiGateway:
 # # Attributes to use when the metastore is emptyDir
 #   medium: ""
 
+
 ## Worker ##
 
 worker:
   env:
-  # Extra environment variables for the worker pod
-  # Example:
-  # JAVA_HOME: /opt/java
+    # Extra environment variables for the worker pod
+    # Example:
+    # JAVA_HOME: /opt/java
   args:
     - worker-only
     - --no-format
   # Properties for the worker component
   properties:
   resources:
     limits:
-    #      cpu: "4"
-    #      memory: "4G"
+#      cpu: "4"
+#      memory: "4G"
     requests:
-  #      cpu: "1"
-  #      memory: "2G"
+#      cpu: "1"
+#      memory: "2G"
   ports:
     rpc: 29999
     web: 30000
@@ -240,6 +243,7 @@ worker:
   # - name: myConfigMapVolume
   #   mountPath: /data/configmap/myConfigMapVolume/
   volumes: []
+
 
 jobWorker:
   args:
@@ -248,11 +252,11 @@ jobWorker:
   properties:
   resources:
     limits:
-    #      cpu: "4"
-    #      memory: "4G"
+#      cpu: "4"
+#      memory: "4G"
     requests:
-  #      cpu: "1"
-  #      memory: "1G"
+#      cpu: "1"
+#      memory: "1G"
   ports:
     rpc: 30001
     data: 30002
@@ -296,14 +300,14 @@ jobWorker:
 #    quota: 10G,10G
 tieredstore:
   levels:
-    - level: 0
-      alias: MEM
-      mediumtype: MEM
-      path: /dev/shm
-      type: emptyDir
-      quota: 1G
-      high: 0.95
-      low: 0.7
+  - level: 0
+    alias: MEM
+    mediumtype: MEM
+    path: /dev/shm
+    type: emptyDir
+    quota: 1G
+    high: 0.95
+    low: 0.7
 
 # Short circuit related properties
 shortCircuit:
@@ -324,6 +328,7 @@ shortCircuit:
   # Attributes to use if the domain socket volume is hostPath
   hostPath: "/tmp/alluxio-domain" # The hostPath directory to use
 
+
 ## FUSE ##
 
 fuse:
@@ -351,7 +356,7 @@ fuse:
   hostNetwork: true
   # hostPID requires escalated privileges
   hostPID: true
-  dnsPolicy: ""
+  dnsPolicy: ClusterFirstWithHostNet
   user: 0
   group: 0
   fsGroup: 0
@@ -362,18 +367,21 @@ fuse:
   mountPath: /mnt/alluxio-fuse
   resources:
     requests:
-    #      cpu: "0.5"
-    #      memory: "1G"
+#      cpu: "0.5"
+#      memory: "1G"
     limits:
-  #      cpu: "4"
-  #      memory: "4G"
+#      cpu: "4"
+#      memory: "4G"
   volumeMounts: []
   # volumeMounts:
   # - name: mySecretVolume
   #   mountPath: /data/secrets/mySecretVolume/
   # - name: myConfigMapVolume
   #   mountPath: /data/configmap/myConfigMapVolume/
   volumes: []
+
+
+
 ## HDFS Configuraions ##
 # hadoopConfig:
 #   configMap: hdfs-configmap

diff --git a/cmd/alluxio/app/alluxio.go b/cmd/alluxio/app/alluxio.go
@@ -13,12 +13,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package app
 
 import (
 	"os"
 	// +kubebuilder:scaffold:imports
 
+	"github.com/fluid-cloudnative/fluid"
+	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
+	alluxioctl "github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/alluxio"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/alluxio"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	"github.com/spf13/cobra"
 	zapOpt "go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -29,14 +37,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
-	"github.com/fluid-cloudnative/fluid"
-	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
-	alluxioctl "github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/alluxio"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/alluxio"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
-	"github.com/fluid-cloudnative/fluid/pkg/utils"
 )
 
 var (

diff --git a/cmd/alluxio/app/version.go b/cmd/alluxio/app/version.go
@@ -17,9 +17,8 @@ limitations under the License.
 package app
 
 import (
-	"github.com/spf13/cobra"
-
 	"github.com/fluid-cloudnative/fluid"
+	"github.com/spf13/cobra"
 )
 
 var (

diff --git a/cmd/csi/app/csi.go b/cmd/csi/app/csi.go
@@ -26,17 +26,16 @@ import (
 	"os"
 	"time"
 
-	"github.com/golang/glog"
-	"github.com/spf13/cobra"
-	"k8s.io/apimachinery/pkg/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	ctrl "sigs.k8s.io/controller-runtime"
-
 	"github.com/fluid-cloudnative/fluid"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/csi"
 	"github.com/fluid-cloudnative/fluid/pkg/csi/config"
 	utilfeature "github.com/fluid-cloudnative/fluid/pkg/utils/feature"
+	"github.com/golang/glog"
+	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
 )
 
 var (

diff --git a/cmd/csi/app/version.go b/cmd/csi/app/version.go
@@ -17,9 +17,8 @@ limitations under the License.
 package app
 
 import (
-	"github.com/spf13/cobra"
-
 	"github.com/fluid-cloudnative/fluid"
+	"github.com/spf13/cobra"
 )
 
 var (

diff --git a/cmd/csi/main.go b/cmd/csi/main.go
@@ -16,15 +16,16 @@ limitations under the License.
 package main
 
 import (
-	"os"
-
 	"github.com/fluid-cloudnative/fluid/cmd/csi/app"
+	"os"
 )
 
 func main() {
 	cmd := app.NewCSICommand()
+
 	if err := cmd.Execute(); err != nil {
 		app.ErrorAndExit(err)
-		os.Exit(1)
 	}
+
+	os.Exit(0)
 }
diff --git a/cmd/dataset/app/dataset.go b/cmd/dataset/app/dataset.go
@@ -19,15 +19,6 @@ package app
 import (
 	"os"
 
-	"github.com/spf13/cobra"
-	zapOpt "go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"k8s.io/apimachinery/pkg/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
 	"github.com/fluid-cloudnative/fluid"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	databackupctl "github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/databackup"
@@ -36,6 +27,14 @@ import (
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/alluxio"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
 	"github.com/fluid-cloudnative/fluid/pkg/utils"
+	"github.com/spf13/cobra"
+	zapOpt "go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 var (

diff --git a/cmd/dataset/app/version.go b/cmd/dataset/app/version.go
@@ -17,9 +17,8 @@ limitations under the License.
 package app
 
 import (
-	"github.com/spf13/cobra"
-
 	"github.com/fluid-cloudnative/fluid"
+	"github.com/spf13/cobra"
 )
 
 var (

diff --git a/cmd/jindo/app/jindo.go b/cmd/jindo/app/jindo.go
@@ -19,6 +19,15 @@ package app
 import (
 	"os"
 
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindofsx"
+
+	"github.com/fluid-cloudnative/fluid"
+	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
+	jindoctl "github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/jindo"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindo"
+	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	"github.com/spf13/cobra"
 	zapOpt "go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -28,15 +37,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
-	"github.com/fluid-cloudnative/fluid"
-	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
-	jindoctl "github.com/fluid-cloudnative/fluid/pkg/controllers/v1alpha1/jindo"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindo"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindofsx"
-	"github.com/fluid-cloudnative/fluid/pkg/utils"
 )
 
 var (

diff --git a/cmd/jindo/app/version.go b/cmd/jindo/app/version.go
@@ -17,9 +17,8 @@ limitations under the License.
 package app
 
 import (
-	"github.com/spf13/cobra"
-
 	"github.com/fluid-cloudnative/fluid"
+	"github.com/spf13/cobra"
 )
 
 var (

diff --git a/cmd/jindo/main.go b/cmd/jindo/main.go
@@ -24,6 +24,7 @@ import (
 )
 
 func main() {
+
 	command := app.NewJindoFSCommand()
 	if err := command.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "%s", err.Error())