diff --git a/api/v1alpha1/alluxiocluster_types.go b/api/v1alpha1/alluxiocluster_types.go index 682ed0e67..bf46fbd3d 100644 --- a/api/v1alpha1/alluxiocluster_types.go +++ b/api/v1alpha1/alluxiocluster_types.go @@ -122,8 +122,10 @@ type PagestoreSpec struct { type MetastoreSpec struct { Enabled *bool `json:"enabled,omitempty" yaml:"enabled,omitempty"` + HostPath *bool `json:"hostPath,omitempty" yaml:"hostPath,omitempty"` Size string `json:"size,omitempty" yaml:"size,omitempty"` StorageClass string `json:"storageClass,omitempty" yaml:"storageClass,omitempty"` + Type string `json:"type,omitempty" yaml:"type,omitempty"` } type ProxySpec struct { diff --git a/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml b/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml index 31ed7fe31..39d6390c2 100644 --- a/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml +++ b/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml @@ -2098,10 +2098,14 @@ spec: properties: enabled: type: boolean + hostPath: + type: string size: type: string storageClass: type: string + type: + type: string type: object metrics: properties: diff --git a/deploy/charts/alluxio/templates/fuse/daemonset.yaml b/deploy/charts/alluxio/templates/fuse/daemonset.yaml index 274b29ab6..5c89de4da 100644 --- a/deploy/charts/alluxio/templates/fuse/daemonset.yaml +++ b/deploy/charts/alluxio/templates/fuse/daemonset.yaml @@ -129,7 +129,7 @@ spec: {{- end }} command: ["/bin/sh", "-c"] args: - - umount -l {{ $alluxioFuseMountPoint }}; + - umount -l -f {{ $alluxioFuseMountPoint }}; {{- $mountTableSource := get .Values.properties "alluxio.mount.table.source" }} {{- if or (eq $mountTableSource "ETCD") (eq $mountTableSource "STATIC_FILE") }} /entrypoint.sh fuse {{ $alluxioFuseMountPoint }} {{- range .Values.fuse.mountOptions }} -o {{ . }} {{- end }} diff --git a/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml b/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml index 31ed7fe31..39d6390c2 100644 --- a/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml +++ b/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml @@ -2098,10 +2098,14 @@ spec: properties: enabled: type: boolean + hostPath: + type: string size: type: string storageClass: type: string + type: + type: string type: object metrics: properties: diff --git a/tests/helm/expectedTemplates/fuse/daemonset.yaml b/tests/helm/expectedTemplates/fuse/daemonset.yaml index b1d4ac9b2..c9e861470 100644 --- a/tests/helm/expectedTemplates/fuse/daemonset.yaml +++ b/tests/helm/expectedTemplates/fuse/daemonset.yaml @@ -139,7 +139,7 @@ spec: memory: 1Gi command: ["/bin/sh", "-c"] args: - - umount -l /mnt/alluxio/fuse; + - umount -l -f /mnt/alluxio/fuse; /entrypoint.sh fuse /dummy/dataset/path /mnt/alluxio/fuse -o allow_other -o entry_timeout=3600 -o attr_timeout=3600 env: - name: ALLUXIO_CLIENT_HOSTNAME